From 9f56debcde5617d7bf13288b9bebca763e4fe234 Mon Sep 17 00:00:00 2001 From: Wei-Ning Huang Date: Sat, 20 Oct 2018 17:01:15 +0800 Subject: Remove reference of Rinkeby network. We do not need ethereum Rinkeby network in our system, remove it. --- cmd/geth/chaincmd.go | 1 - cmd/geth/consolecmd.go | 2 -- cmd/geth/main.go | 3 +-- cmd/geth/usage.go | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) (limited to 'cmd/geth') diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 63850304a..ce4216a94 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -135,7 +135,6 @@ The export-preimages command export hash preimages to an RLP encoded stream`, utils.SyncModeFlag, utils.FakePoWFlag, utils.TestnetFlag, - utils.RinkebyFlag, }, Category: "BLOCKCHAIN COMMANDS", Description: ` diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index 528ed30e3..339919c8d 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -124,8 +124,6 @@ func remoteConsole(ctx *cli.Context) error { if path != "" { if ctx.GlobalBool(utils.TestnetFlag.Name) { path = filepath.Join(path, "testnet") - } else if ctx.GlobalBool(utils.RinkebyFlag.Name) { - path = filepath.Join(path, "rinkeby") } } endpoint = fmt.Sprintf("%s/geth.ipc", path) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index f37e30701..3b604b181 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -27,7 +27,6 @@ import ( "strings" "time" - "github.com/elastic/gosigar" "github.com/dexon-foundation/dexon/accounts" "github.com/dexon-foundation/dexon/accounts/keystore" "github.com/dexon-foundation/dexon/cmd/utils" @@ -38,6 +37,7 @@ import ( "github.com/dexon-foundation/dexon/log" "github.com/dexon-foundation/dexon/metrics" "github.com/dexon-foundation/dexon/node" + "github.com/elastic/gosigar" "gopkg.in/urfave/cli.v1" ) @@ -120,7 +120,6 @@ var ( utils.DeveloperFlag, utils.DeveloperPeriodFlag, utils.TestnetFlag, - utils.RinkebyFlag, utils.VMEnableDebugFlag, utils.NetworkIdFlag, utils.ConstantinopleOverrideFlag, diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index fde0cc955..941ae5b8e 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -73,7 +73,6 @@ var AppHelpFlagGroups = []flagGroup{ utils.NoUSBFlag, utils.NetworkIdFlag, utils.TestnetFlag, - utils.RinkebyFlag, utils.SyncModeFlag, utils.GCModeFlag, utils.EthStatsURLFlag, -- cgit v1.2.3