diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-12-22 19:49:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-22 19:49:16 +0800 |
| commit | 115364b0a9838263c77fe195d7f586c8a295dad3 (patch) | |
| tree | 7dab84f57fcd372389377df4070ea057922e1d21 /node | |
| parent | 6d15d00ac4b5f162737a27dfa6f8e9976383776e (diff) | |
| parent | 12c964b2b7c70949ae5a8c54cf73be7bbd8c97b4 (diff) | |
| download | go-tangerine-115364b0a9838263c77fe195d7f586c8a295dad3.tar go-tangerine-115364b0a9838263c77fe195d7f586c8a295dad3.tar.gz go-tangerine-115364b0a9838263c77fe195d7f586c8a295dad3.tar.bz2 go-tangerine-115364b0a9838263c77fe195d7f586c8a295dad3.tar.lz go-tangerine-115364b0a9838263c77fe195d7f586c8a295dad3.tar.xz go-tangerine-115364b0a9838263c77fe195d7f586c8a295dad3.tar.zst go-tangerine-115364b0a9838263c77fe195d7f586c8a295dad3.zip | |
Merge pull request #3475 from fjl/rpc-hex-improvements
rpc: remove HexBytes, HexNumber
Diffstat (limited to 'node')
| -rw-r--r-- | node/api.go | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/node/api.go b/node/api.go index 7c9ad601a..988eff379 100644 --- a/node/api.go +++ b/node/api.go @@ -25,7 +25,6 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" "github.com/rcrowley/go-metrics" ) @@ -75,7 +74,7 @@ func (api *PrivateAdminAPI) RemovePeer(url string) (bool, error) { } // StartRPC starts the HTTP RPC API server. -func (api *PrivateAdminAPI) StartRPC(host *string, port *rpc.HexNumber, cors *string, apis *string) (bool, error) { +func (api *PrivateAdminAPI) StartRPC(host *string, port *int, cors *string, apis *string) (bool, error) { api.node.lock.Lock() defer api.node.lock.Unlock() @@ -91,7 +90,7 @@ func (api *PrivateAdminAPI) StartRPC(host *string, port *rpc.HexNumber, cors *st host = &h } if port == nil { - port = rpc.NewHexNumber(api.node.config.HTTPPort) + port = &api.node.config.HTTPPort } if cors == nil { cors = &api.node.config.HTTPCors @@ -105,7 +104,7 @@ func (api *PrivateAdminAPI) StartRPC(host *string, port *rpc.HexNumber, cors *st } } - if err := api.node.startHTTP(fmt.Sprintf("%s:%d", *host, port.Int()), api.node.rpcAPIs, modules, *cors); err != nil { + if err := api.node.startHTTP(fmt.Sprintf("%s:%d", *host, port), api.node.rpcAPIs, modules, *cors); err != nil { return false, err } return true, nil @@ -124,7 +123,7 @@ func (api *PrivateAdminAPI) StopRPC() (bool, error) { } // StartWS starts the websocket RPC API server. -func (api *PrivateAdminAPI) StartWS(host *string, port *rpc.HexNumber, allowedOrigins *string, apis *string) (bool, error) { +func (api *PrivateAdminAPI) StartWS(host *string, port *int, allowedOrigins *string, apis *string) (bool, error) { api.node.lock.Lock() defer api.node.lock.Unlock() @@ -140,7 +139,7 @@ func (api *PrivateAdminAPI) StartWS(host *string, port *rpc.HexNumber, allowedOr host = &h } if port == nil { - port = rpc.NewHexNumber(api.node.config.WSPort) + port = &api.node.config.WSPort } if allowedOrigins == nil { allowedOrigins = &api.node.config.WSOrigins @@ -154,7 +153,7 @@ func (api *PrivateAdminAPI) StartWS(host *string, port *rpc.HexNumber, allowedOr } } - if err := api.node.startWS(fmt.Sprintf("%s:%d", *host, port.Int()), api.node.rpcAPIs, modules, *allowedOrigins); err != nil { + if err := api.node.startWS(fmt.Sprintf("%s:%d", *host, *port), api.node.rpcAPIs, modules, *allowedOrigins); err != nil { return false, err } return true, nil |