diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-14 20:57:16 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-14 20:57:16 +0800 |
| commit | 278ee3f16c407d18e311d51443e458a286fb3b71 (patch) | |
| tree | 19365711978cdaa54067e583cc493a30e033c802 /ethereal | |
| parent | 9a057021c3bb7b73843677b7abefc7763f34e39e (diff) | |
| parent | a1dcc5cd1793dc05e2ff38e8a8024690e09aebf5 (diff) | |
| download | go-tangerine-278ee3f16c407d18e311d51443e458a286fb3b71.tar go-tangerine-278ee3f16c407d18e311d51443e458a286fb3b71.tar.gz go-tangerine-278ee3f16c407d18e311d51443e458a286fb3b71.tar.bz2 go-tangerine-278ee3f16c407d18e311d51443e458a286fb3b71.tar.lz go-tangerine-278ee3f16c407d18e311d51443e458a286fb3b71.tar.xz go-tangerine-278ee3f16c407d18e311d51443e458a286fb3b71.tar.zst go-tangerine-278ee3f16c407d18e311d51443e458a286fb3b71.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'ethereal')
| -rw-r--r-- | ethereal/ethereum.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/ethereal/ethereum.go b/ethereal/ethereum.go index 63f907571..98fab18e3 100644 --- a/ethereal/ethereum.go +++ b/ethereal/ethereum.go @@ -4,8 +4,6 @@ import ( "fmt" "github.com/ethereum/eth-go" "github.com/ethereum/eth-go/ethchain" - "github.com/ethereum/eth-go/ethpub" - "github.com/ethereum/eth-go/ethrpc" "github.com/ethereum/eth-go/ethutil" "github.com/ethereum/go-ethereum/ethereal/ui" "github.com/ethereum/go-ethereum/utils" @@ -115,12 +113,7 @@ save these words so you can restore your account later: %s } if StartRpc { - ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum), RpcPort) - if err != nil { - log.Println("Could not start RPC interface:", err) - } else { - go ethereum.RpcServer.Start() - } + utils.DoRpc(ethereum, RpcPort) } log.Printf("Starting Ethereum GUI v%s\n", ethutil.Config.Ver) |