diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-04 03:34:48 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-04 03:34:48 +0800 |
| commit | bb152612e0466164d33ff7f2023d804d7db18c01 (patch) | |
| tree | e4210c42c574e986fd886c753258b7d063597095 /cmd/utils | |
| parent | cfe3af099c7fb4b637132a5c0ab2b94569418084 (diff) | |
| parent | 253eb778d19af9204c9dd65e3963bd63f3bab6f0 (diff) | |
| download | go-tangerine-bb152612e0466164d33ff7f2023d804d7db18c01.tar.gz go-tangerine-bb152612e0466164d33ff7f2023d804d7db18c01.tar.zst go-tangerine-bb152612e0466164d33ff7f2023d804d7db18c01.zip | |
Merge branch 'develop' into poc-9
Conflicts:
cmd/utils/cmd.go
Diffstat (limited to 'cmd/utils')
| -rw-r--r-- | cmd/utils/cmd.go | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 794753f11..2bd34d792 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -34,7 +34,6 @@ import ( "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/rlp" 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/xeth" ) @@ -169,18 +168,6 @@ func StartRpc(ethereum *eth.Ethereum, RpcListenAddress string, RpcPort int) { } } -func StartWebSockets(eth *eth.Ethereum, wsPort int) { - clilogger.Infoln("Starting WebSockets") - - var err error - 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 { - go eth.WsServer.Start() - } -} - func FormatTransactionData(data string) []byte { d := ethutil.StringToByteFunc(data, func(s string) (ret []byte) { slice := regexp.MustCompile("\\n|\\s").Split(s, 1000000000) |