diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-11 18:40:12 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-11 18:40:12 +0800 |
| commit | cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007 (patch) | |
| tree | ab28c518bd1b78f6b8ac8b241951ad161cb268a9 /cmd/utils/cmd.go | |
| parent | 21fd31dad8bc6e0291ca405314b516670333c707 (diff) | |
| parent | c6af5f0a275608ea6c797ef826e6090885f24eac (diff) | |
| download | dexon-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar dexon-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar.gz dexon-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar.bz2 dexon-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar.lz dexon-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar.xz dexon-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar.zst dexon-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.zip | |
Merge branch 'develop' into jsonrpc
Conflicts:
rpc/ws/server.go
Diffstat (limited to 'cmd/utils/cmd.go')
| -rw-r--r-- | cmd/utils/cmd.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 1d4655433..70df289c3 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -41,7 +41,6 @@ import ( rpchttp "github.com/ethereum/go-ethereum/rpc/http" rpcws "github.com/ethereum/go-ethereum/rpc/ws" "github.com/ethereum/go-ethereum/state" - // "github.com/ethereum/go-ethereum/websocket" "github.com/ethereum/go-ethereum/xeth" ) @@ -122,9 +121,9 @@ func exit(err error) { os.Exit(status) } -func StartEthereum(ethereum *eth.Ethereum, UseSeed bool) { +func StartEthereum(ethereum *eth.Ethereum, SeedNode string) { clilogger.Infof("Starting %s", ethereum.ClientIdentity()) - err := ethereum.Start(UseSeed) + err := ethereum.Start(SeedNode) if err != nil { exit(err) } @@ -205,10 +204,8 @@ func StartRpc(ethereum *eth.Ethereum, RpcPort int) { func StartWebSockets(eth *eth.Ethereum, wsPort int) { clilogger.Infoln("Starting WebSockets") - // sock := websocket.NewWebSocketServer(eth) - // go sock.Serv() var err error - eth.WsServer, err = rpcws.NewWebSocketServer(eth, wsPort) + eth.WsServer, err = rpcws.NewWebSocketServer(xeth.New(eth), wsPort) if err != nil { clilogger.Errorf("Could not start RPC interface (port %v): %v", wsPort, err) } else { |