diff options
| author | Daniel A. Nagy <nagy.da@gmail.com> | 2015-05-11 18:47:14 +0800 |
|---|---|---|
| committer | Daniel A. Nagy <nagy.da@gmail.com> | 2015-05-11 18:47:14 +0800 |
| commit | a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5 (patch) | |
| tree | 6c16d3e2b216fdf0027a477a8975c9052930e34a /xeth | |
| parent | 1fe70a66ba2ef0f148affa7a72b4e65023474859 (diff) | |
| parent | 5176fbc6faaa5e7f0305ad7f2b896c092781deaa (diff) | |
| download | dexon-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar dexon-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.gz dexon-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.bz2 dexon-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.lz dexon-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.xz dexon-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.zst dexon-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Conflicts:
rpc/jeth.go
Diffstat (limited to 'xeth')
| -rw-r--r-- | xeth/xeth.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xeth/xeth.go b/xeth/xeth.go index dc2d4f06f..06cd9dc1b 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -79,7 +79,6 @@ func New(eth *eth.Ethereum, frontend Frontend) *XEth { xeth := &XEth{ backend: eth, frontend: frontend, - whisper: NewWhisper(eth.Whisper()), quit: make(chan struct{}), filterManager: filter.NewFilterManager(eth.EventMux()), logQueue: make(map[int]*logQueue), @@ -88,6 +87,9 @@ func New(eth *eth.Ethereum, frontend Frontend) *XEth { messages: make(map[int]*whisperFilter), agent: miner.NewRemoteAgent(), } + if eth.Whisper() != nil { + xeth.whisper = NewWhisper(eth.Whisper()) + } eth.Miner().Register(xeth.agent) if frontend == nil { xeth.frontend = dummyFrontend{} |