aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/utils
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-10-31 21:30:08 +0800
committerobscuren <geffobscura@gmail.com>2014-10-31 21:30:08 +0800
commit0ed1a8b50a9b9726cd57a2731d0405f6949c6188 (patch)
tree9f877ecdc89b784cd2820db8ca3f1de6e9c4d3e9 /cmd/utils
parent8826e9694c3a8d4f480f0a021d8c02f7f61612c6 (diff)
downloaddexon-0ed1a8b50a9b9726cd57a2731d0405f6949c6188.tar.gz
dexon-0ed1a8b50a9b9726cd57a2731d0405f6949c6188.tar.zst
dexon-0ed1a8b50a9b9726cd57a2731d0405f6949c6188.zip
ethpipe => xeth (eXtended ETHereum)
Diffstat (limited to 'cmd/utils')
-rw-r--r--cmd/utils/cmd.go4
-rw-r--r--cmd/utils/websockets.go4
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index 7ee41d042..d9914a6f4 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -17,11 +17,11 @@ import (
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/ethminer"
- "github.com/ethereum/go-ethereum/ethpipe"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/ethwire"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/xeth"
)
var clilogger = logger.NewLogger("CLI")
@@ -244,7 +244,7 @@ func KeyTasks(keyManager *crypto.KeyManager, KeyRing string, GenAddr bool, Secre
func StartRpc(ethereum *eth.Ethereum, RpcPort int) {
var err error
- ethereum.RpcServer, err = rpc.NewJsonRpcServer(ethpipe.NewJSPipe(ethereum), RpcPort)
+ ethereum.RpcServer, err = rpc.NewJsonRpcServer(xeth.NewJSXEth(ethereum), RpcPort)
if err != nil {
clilogger.Errorf("Could not start RPC interface (port %v): %v", RpcPort, err)
} else {
diff --git a/cmd/utils/websockets.go b/cmd/utils/websockets.go
index 7bda805ac..d3ba50e78 100644
--- a/cmd/utils/websockets.go
+++ b/cmd/utils/websockets.go
@@ -2,9 +2,9 @@ package utils
import (
"github.com/ethereum/go-ethereum"
- "github.com/ethereum/go-ethereum/ethpipe"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/websocket"
+ "github.com/ethereum/go-ethereum/xeth"
)
func args(v ...interface{}) []interface{} {
@@ -21,7 +21,7 @@ func NewWebSocketServer(eth *eth.Ethereum) *WebSocketServer {
}
func (self *WebSocketServer) Serv() {
- pipe := ethpipe.NewJSPipe(self.ethereum)
+ pipe := xeth.NewJSXEth(self.ethereum)
wsServ := websocket.NewServer("/eth", ":40404")
wsServ.MessageFunc(func(c *websocket.Client, msg *websocket.Message) {