diff options
| author | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-07-07 16:55:39 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-07-07 16:55:39 +0800 |
| commit | f9e2e5276f64d5a9c93fb55adda06365be14c26a (patch) | |
| tree | 97aa911429cdda87d8a07c8566e0803a261e23b2 /ethereum/javascript_runtime.go | |
| parent | 8e5117444ebfe4eac4aa96ae431dba5c67b2fcc6 (diff) | |
| parent | 1e4ae24126d21305c8fcbebd057ce4ec28ddd242 (diff) | |
| download | dexon-f9e2e5276f64d5a9c93fb55adda06365be14c26a.tar dexon-f9e2e5276f64d5a9c93fb55adda06365be14c26a.tar.gz dexon-f9e2e5276f64d5a9c93fb55adda06365be14c26a.tar.bz2 dexon-f9e2e5276f64d5a9c93fb55adda06365be14c26a.tar.lz dexon-f9e2e5276f64d5a9c93fb55adda06365be14c26a.tar.xz dexon-f9e2e5276f64d5a9c93fb55adda06365be14c26a.tar.zst dexon-f9e2e5276f64d5a9c93fb55adda06365be14c26a.zip | |
Merge pull request #100 from ethersphere/feature/ethutil-refactor
ethreact - Feature/ethutil refactor
Diffstat (limited to 'ethereum/javascript_runtime.go')
| -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 852a50487..6e107e376 100644 --- a/ethereum/javascript_runtime.go +++ b/ethereum/javascript_runtime.go @@ -6,6 +6,7 @@ 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" @@ -22,8 +23,8 @@ type JSRE struct { vm *otto.Otto lib *ethpub.PEthereum - blockChan chan ethutil.React - changeChan chan ethutil.React + blockChan chan ethreact.Event + changeChan chan ethreact.Event quitChan chan bool objectCb map[string][]otto.Value @@ -48,8 +49,8 @@ func NewJSRE(ethereum *eth.Ethereum) *JSRE { ethereum, otto.New(), ethpub.NewPEthereum(ethereum), - make(chan ethutil.React, 1), - make(chan ethutil.React, 1), + make(chan ethreact.Event), + make(chan ethreact.Event), make(chan bool), make(map[string][]otto.Value), } @@ -63,6 +64,9 @@ 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}) @@ -108,10 +112,6 @@ func (self *JSRE) Stop() { } func (self *JSRE) mainLoop() { - // Subscribe to events - reactor := self.ethereum.Reactor() - reactor.Subscribe("newBlock", self.blockChan) - out: for { select { |