diff --git a/internal/web3ext/web3ext.go b/internal/web3ext/web3ext.go
index 6fcf4b83805dbbb06cada542c5c94bd9a4d89711..aba262699cfbf6d8a6dae40d93f2103008230895 100644
--- a/internal/web3ext/web3ext.go
+++ b/internal/web3ext/web3ext.go
@@ -186,12 +186,24 @@ web3._extend({
call: 'admin_sleepBlocks',
params: 2
}),
+ new web3._extend.Method({
+ name: 'startHTTP',
+ call: 'admin_startHTTP',
+ params: 5,
+ inputFormatter: [null, null, null, null, null]
+ }),
+ new web3._extend.Method({
+ name: 'stopHTTP',
+ call: 'admin_stopHTTP'
+ }),
+ // This method is deprecated.
new web3._extend.Method({
name: 'startRPC',
call: 'admin_startRPC',
- params: 4,
- inputFormatter: [null, null, null, null]
+ params: 5,
+ inputFormatter: [null, null, null, null, null]
}),
+ // This method is deprecated.
new web3._extend.Method({
name: 'stopRPC',
call: 'admin_stopRPC'
diff --git a/node/api.go b/node/api.go
index 083784f4e4ddc9e723b57299950fa43284e6ea18..be20b89d95c059d778a9c3d1838d6a4a3c93b727 100644
--- a/node/api.go
+++ b/node/api.go
@@ -24,6 +24,7 @@ import (
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/internal/debug"
+ "github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/enode"
"github.com/ethereum/go-ethereum/rpc"
@@ -162,8 +163,8 @@ func (api *privateAdminAPI) PeerEvents(ctx context.Context) (*rpc.Subscription,
return rpcSub, nil
}
-// StartRPC starts the HTTP RPC API server.
-func (api *privateAdminAPI) StartRPC(host *string, port *int, cors *string, apis *string, vhosts *string) (bool, error) {
+// StartHTTP starts the HTTP RPC API server.
+func (api *privateAdminAPI) StartHTTP(host *string, port *int, cors *string, apis *string, vhosts *string) (bool, error) {
api.node.lock.Lock()
defer api.node.lock.Unlock()
@@ -216,12 +217,26 @@ func (api *privateAdminAPI) StartRPC(host *string, port *int, cors *string, apis
return true, nil
}
-// StopRPC shuts down the HTTP server.
-func (api *privateAdminAPI) StopRPC() (bool, error) {
+// StartRPC starts the HTTP RPC API server.
+// This method is deprecated. Use StartHTTP instead.
+func (api *privateAdminAPI) StartRPC(host *string, port *int, cors *string, apis *string, vhosts *string) (bool, error) {
+ log.Warn("Deprecation warning", "method", "admin.StartRPC", "use-instead", "admin.StartHTTP")
+ return api.StartHTTP(host, port, cors, apis, vhosts)
+}
+
+// StopHTTP shuts down the HTTP server.
+func (api *privateAdminAPI) StopHTTP() (bool, error) {
api.node.http.stop()
return true, nil
}
+// StopRPC shuts down the HTTP server.
+// This method is deprecated. Use StopHTTP instead.
+func (api *privateAdminAPI) StopRPC() (bool, error) {
+ log.Warn("Deprecation warning", "method", "admin.StopRPC", "use-instead", "admin.StopHTTP")
+ return api.StopHTTP()
+}
+
// StartWS starts the websocket RPC API server.
func (api *privateAdminAPI) StartWS(host *string, port *int, allowedOrigins *string, apis *string) (bool, error) {
api.node.lock.Lock()
diff --git a/node/api_test.go b/node/api_test.go
index 9c3fa3a31dc524aac2f08f05bbf4a25176e2695d..9549adf9c254be4e4cf1e0410f6e0b70500ab915 100644
--- a/node/api_test.go
+++ b/node/api_test.go
@@ -69,7 +69,7 @@ func TestStartRPC(t *testing.T) {
name: "rpc enabled through API",
cfg: Config{},
fn: func(t *testing.T, n *Node, api *privateAdminAPI) {
- _, err := api.StartRPC(sp("127.0.0.1"), ip(0), nil, nil, nil)
+ _, err := api.StartHTTP(sp("127.0.0.1"), ip(0), nil, nil, nil)
assert.NoError(t, err)
},
wantReachable: true,
@@ -90,14 +90,14 @@ func TestStartRPC(t *testing.T) {
port := listener.Addr().(*net.TCPAddr).Port
// Now try to start RPC on that port. This should fail.
- _, err = api.StartRPC(sp("127.0.0.1"), ip(port), nil, nil, nil)
+ _, err = api.StartHTTP(sp("127.0.0.1"), ip(port), nil, nil, nil)
if err == nil {
- t.Fatal("StartRPC should have failed on port", port)
+ t.Fatal("StartHTTP should have failed on port", port)
}
// Try again after unblocking the port. It should work this time.
listener.Close()
- _, err = api.StartRPC(sp("127.0.0.1"), ip(port), nil, nil, nil)
+ _, err = api.StartHTTP(sp("127.0.0.1"), ip(port), nil, nil, nil)
assert.NoError(t, err)
},
wantReachable: true,
@@ -109,7 +109,7 @@ func TestStartRPC(t *testing.T) {
name: "rpc stopped through API",
cfg: Config{HTTPHost: "127.0.0.1"},
fn: func(t *testing.T, n *Node, api *privateAdminAPI) {
- _, err := api.StopRPC()
+ _, err := api.StopHTTP()
assert.NoError(t, err)
},
wantReachable: false,
@@ -121,10 +121,10 @@ func TestStartRPC(t *testing.T) {
name: "rpc stopped twice",
cfg: Config{HTTPHost: "127.0.0.1"},
fn: func(t *testing.T, n *Node, api *privateAdminAPI) {
- _, err := api.StopRPC()
+ _, err := api.StopHTTP()
assert.NoError(t, err)
- _, err = api.StopRPC()
+ _, err = api.StopHTTP()
assert.NoError(t, err)
},
wantReachable: false,
@@ -211,14 +211,14 @@ func TestStartRPC(t *testing.T) {
{
name: "rpc stopped with ws enabled",
fn: func(t *testing.T, n *Node, api *privateAdminAPI) {
- _, err := api.StartRPC(sp("127.0.0.1"), ip(0), nil, nil, nil)
+ _, err := api.StartHTTP(sp("127.0.0.1"), ip(0), nil, nil, nil)
assert.NoError(t, err)
wsport := n.http.port
_, err = api.StartWS(sp("127.0.0.1"), ip(wsport), nil, nil)
assert.NoError(t, err)
- _, err = api.StopRPC()
+ _, err = api.StopHTTP()
assert.NoError(t, err)
},
wantReachable: false,
@@ -233,7 +233,7 @@ func TestStartRPC(t *testing.T) {
assert.NoError(t, err)
wsport := n.http.port
- _, err = api.StartRPC(sp("127.0.0.1"), ip(wsport), nil, nil, nil)
+ _, err = api.StartHTTP(sp("127.0.0.1"), ip(wsport), nil, nil, nil)
assert.NoError(t, err)
},
wantReachable: true,