Fix circular deps

bcb3ad73 · Maran · 231ad9b5 · bcb3ad73
Commit bcb3ad73 authored May 02, 2014 by Maran
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

ethereum.go ethereum/ethereum.go +5 -2

No files found.
--- 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)