diff options
| author | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-07-07 16:58:42 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-07-07 16:58:42 +0800 |
| commit | 0c132e4c9e88bc0e13ad424f4c3b51cd4f5e8354 (patch) | |
| tree | 0399c40eff878c381413d96e2e304441edff775d /ethereum | |
| parent | f9e2e5276f64d5a9c93fb55adda06365be14c26a (diff) | |
| download | go-tangerine-0c132e4c9e88bc0e13ad424f4c3b51cd4f5e8354.tar.gz go-tangerine-0c132e4c9e88bc0e13ad424f4c3b51cd4f5e8354.tar.zst go-tangerine-0c132e4c9e88bc0e13ad424f4c3b51cd4f5e8354.zip | |
Revert "ethreact - Feature/ethutil refactor"
Diffstat (limited to 'ethereum')
| -rw-r--r-- | ethereum/javascript_runtime.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ethereum/javascript_runtime.go b/ethereum/javascript_runtime.go index 6e107e376..852a50487 100644 --- a/ethereum/javascript_runtime.go +++ b/ethereum/javascript_runtime.go @@ -6,7 +6,6 @@ import ( "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethlog" "github.com/ethereum/eth-go/ethpub" - "github.com/ethereum/eth-go/ethreact" "github.com/ethereum/eth-go/ethutil" "github.com/ethereum/go-ethereum/utils" "github.com/obscuren/otto" @@ -23,8 +22,8 @@ type JSRE struct { vm *otto.Otto lib *ethpub.PEthereum - blockChan chan ethreact.Event - changeChan chan ethreact.Event + blockChan chan ethutil.React + changeChan chan ethutil.React quitChan chan bool objectCb map[string][]otto.Value @@ -49,8 +48,8 @@ func NewJSRE(ethereum *eth.Ethereum) *JSRE { ethereum, otto.New(), ethpub.NewPEthereum(ethereum), - make(chan ethreact.Event), - make(chan ethreact.Event), + make(chan ethutil.React, 1), + make(chan ethutil.React, 1), make(chan bool), make(map[string][]otto.Value), } @@ -64,9 +63,6 @@ func NewJSRE(ethereum *eth.Ethereum) *JSRE { // We have to make sure that, whoever calls this, calls "Stop" go re.mainLoop() - // Subscribe to events - reactor := ethereum.Reactor() - reactor.Subscribe("newBlock", re.blockChan) re.Bind("eth", &JSEthereum{re.lib, re.vm}) @@ -112,6 +108,10 @@ func (self *JSRE) Stop() { } func (self *JSRE) mainLoop() { + // Subscribe to events + reactor := self.ethereum.Reactor() + reactor.Subscribe("newBlock", self.blockChan) + out: for { select { |