aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaran <maran.hidskes@gmail.com>2014-05-03 02:01:25 +0800
committerMaran <maran.hidskes@gmail.com>2014-05-03 02:01:25 +0800
commitbcb3ad733258b3d8f639763c2c78c85f43b2c826 (patch)
treefdbc81f1a90d80db83c4fba94bd167987b076866
parent231ad9b562f4870d6fa6b250e791437d330c5535 (diff)
downloaddexon-bcb3ad733258b3d8f639763c2c78c85f43b2c826.tar.gz
dexon-bcb3ad733258b3d8f639763c2c78c85f43b2c826.tar.zst
dexon-bcb3ad733258b3d8f639763c2c78c85f43b2c826.zip
Fix circular deps
-rw-r--r--ethereum/ethereum.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go
index 0b56855e0..829f71e39 100644
--- a/ethereum/ethereum.go
+++ b/ethereum/ethereum.go
@@ -6,6 +6,7 @@ import (
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/etherpc"
"github.com/ethereum/eth-go/ethminer"
+ "github.com/ethereum/eth-go/ethpub"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/go-ethereum/utils"
"log"
@@ -133,8 +134,10 @@ func main() {
go console.Start()
}
if StartRpc {
- ethereum.RpcServer = etherpc.NewJsonRpcServer()
- go ethereum.RpcServer.Start()
+ // TODO: Can we make this work again?
+ //ethereum.RpcServer = etherpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum))
+ rpc := etherpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum))
+ go rpc.Start()
}
RegisterInterrupts(ethereum)