diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-02-09 19:24:42 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-02-09 19:24:42 +0800 |
| commit | 900e124beea551ded290f61e7bf85ff6b2e4a29e (patch) | |
| tree | f4447602e77956699a8df44a1edc9932688d48fd /cmd/geth | |
| parent | 7486904b92449c5955bb682f4ff98752906912b8 (diff) | |
| download | go-tangerine-900e124beea551ded290f61e7bf85ff6b2e4a29e.tar go-tangerine-900e124beea551ded290f61e7bf85ff6b2e4a29e.tar.gz go-tangerine-900e124beea551ded290f61e7bf85ff6b2e4a29e.tar.bz2 go-tangerine-900e124beea551ded290f61e7bf85ff6b2e4a29e.tar.lz go-tangerine-900e124beea551ded290f61e7bf85ff6b2e4a29e.tar.xz go-tangerine-900e124beea551ded290f61e7bf85ff6b2e4a29e.tar.zst go-tangerine-900e124beea551ded290f61e7bf85ff6b2e4a29e.zip | |
cmd, common, node, rpc: rework naming convention to canonical one
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/js_test.go | 4 | ||||
| -rw-r--r-- | cmd/geth/main.go | 6 | ||||
| -rw-r--r-- | cmd/geth/monitorcmd.go | 2 | ||||
| -rw-r--r-- | cmd/geth/usage.go | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 58800ed44..ed6e5b319 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -96,7 +96,7 @@ func testREPL(t *testing.T, config func(*eth.Config)) (string, *testjethre, *nod t.Fatal(err) } // Create a networkless protocol stack - stack, err := node.New(&node.Config{PrivateKey: testNodeKey, Name: "test", NoDiscovery: true, IpcPath: fmt.Sprintf("geth-test-%d.ipc", rand.Int63())}) + stack, err := node.New(&node.Config{PrivateKey: testNodeKey, Name: "test", NoDiscovery: true, IPCPath: fmt.Sprintf("geth-test-%d.ipc", rand.Int63())}) if err != nil { t.Fatalf("failed to create node: %v", err) } @@ -142,7 +142,7 @@ func testREPL(t *testing.T, config func(*eth.Config)) (string, *testjethre, *nod stack.Service(ðereum) assetPath := filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist", "assets", "ext") - client, err := utils.NewRemoteRPCClientFromString("ipc:" + stack.IpcEndpoint()) + client, err := utils.NewRemoteRPCClientFromString("ipc:" + stack.IPCEndpoint()) if err != nil { t.Fatalf("failed to attach to node: %v", err) } diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 61f0632db..5c07be3f6 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -312,7 +312,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.WSListenAddrFlag, utils.WSPortFlag, utils.WSApiFlag, - utils.WSCORSDomainFlag, + utils.WSAllowedDomainsFlag, utils.IPCDisabledFlag, utils.IPCApiFlag, utils.IPCPathFlag, @@ -425,7 +425,7 @@ func console(ctx *cli.Context) { startNode(ctx, node) // Attach to the newly started node, and either execute script or become interactive - client, err := utils.NewRemoteRPCClientFromString("ipc:" + node.IpcEndpoint()) + client, err := utils.NewRemoteRPCClientFromString("ipc:" + node.IPCEndpoint()) if err != nil { utils.Fatalf("Failed to attach to the inproc geth: %v", err) } @@ -451,7 +451,7 @@ func execScripts(ctx *cli.Context) { startNode(ctx, node) // Attach to the newly started node and execute the given scripts - client, err := utils.NewRemoteRPCClientFromString("ipc:" + node.IpcEndpoint()) + client, err := utils.NewRemoteRPCClientFromString("ipc:" + node.IPCEndpoint()) if err != nil { utils.Fatalf("Failed to attach to the inproc geth: %v", err) } diff --git a/cmd/geth/monitorcmd.go b/cmd/geth/monitorcmd.go index 4d56f2289..ce3a20e8a 100644 --- a/cmd/geth/monitorcmd.go +++ b/cmd/geth/monitorcmd.go @@ -36,7 +36,7 @@ import ( var ( monitorCommandAttachFlag = cli.StringFlag{ Name: "attach", - Value: "ipc:" + node.DefaultIpcEndpoint(), + Value: "ipc:" + node.DefaultIPCEndpoint(), Usage: "API endpoint to attach to", } monitorCommandRowsFlag = cli.IntFlag{ diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index e20c67bf8..051c51878 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -93,7 +93,7 @@ var AppHelpFlagGroups = []flagGroup{ utils.WSListenAddrFlag, utils.WSPortFlag, utils.WSApiFlag, - utils.WSCORSDomainFlag, + utils.WSAllowedDomainsFlag, utils.IPCDisabledFlag, utils.IPCApiFlag, utils.IPCPathFlag, |