aboutsummaryrefslogtreecommitdiffstats
path: root/ethereum.go
diff options
context:
space:
mode:
authorMaran <maran.hidskes@gmail.com>2014-05-05 20:15:31 +0800
committerMaran <maran.hidskes@gmail.com>2014-05-05 20:15:31 +0800
commitfde3e01f80420c367139a9fe647c618b0223842d (patch)
tree6afa997a20de1106edff6e8186180ff26fc8a8e1 /ethereum.go
parentc496aad20bebdeea240ee4b6cc8730d484240ca8 (diff)
downloadgo-tangerine-fde3e01f80420c367139a9fe647c618b0223842d.tar.gz
go-tangerine-fde3e01f80420c367139a9fe647c618b0223842d.tar.zst
go-tangerine-fde3e01f80420c367139a9fe647c618b0223842d.zip
Fixed import cycle
Diffstat (limited to 'ethereum.go')
-rw-r--r--ethereum.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/ethereum.go b/ethereum.go
index 6cb1a916f..d6154e213 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -4,6 +4,7 @@ import (
"container/list"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethdb"
+ "github.com/ethereum/eth-go/etherpc"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethwire"
"io/ioutil"
@@ -63,7 +64,7 @@ type Ethereum struct {
reactor *ethutil.ReactorEngine
- // TODO: This no worky: RpcServer *etherpc.JsonRpcServer
+ RpcServer *etherpc.JsonRpcServer
}
func New(caps Caps, usePnp bool) (*Ethereum, error) {
@@ -338,9 +339,9 @@ func (s *Ethereum) Stop() {
close(s.quit)
+ s.RpcServer.Stop()
s.txPool.Stop()
s.stateManager.Stop()
- // TODO: THIS NO WORKY: s.RpcServer.Stop()
close(s.shutdownChan)
}