Fix circular deps

This commit is contained in:
Maran 2014-05-02 20:01:25 +02:00
parent 231ad9b562
commit bcb3ad7332

View File

@ -6,6 +6,7 @@ import (
"github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/etherpc" "github.com/ethereum/eth-go/etherpc"
"github.com/ethereum/eth-go/ethminer" "github.com/ethereum/eth-go/ethminer"
"github.com/ethereum/eth-go/ethpub"
"github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/go-ethereum/utils" "github.com/ethereum/go-ethereum/utils"
"log" "log"
@ -133,8 +134,10 @@ func main() {
go console.Start() go console.Start()
} }
if StartRpc { if StartRpc {
ethereum.RpcServer = etherpc.NewJsonRpcServer() // TODO: Can we make this work again?
go ethereum.RpcServer.Start() //ethereum.RpcServer = etherpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum))
rpc := etherpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum))
go rpc.Start()
} }
RegisterInterrupts(ethereum) RegisterInterrupts(ethereum)