Removing flags and data related to Ethereum testnets (#1024)

* working * lint * review changes * fixes * why is it running out of memory * lint
celo-org · May 6, 2020 · 2add2fa · 2add2fa
1 parent 98bf322
commit 2add2fa
Show file tree

Hide file tree

Showing 17 changed files with 102 additions and 374 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -35,6 +35,7 @@ jobs:
             - geth
   build-geth:
     executor: golang
+    resource_class: medium+
     steps:
       - attach_workspace:
           at: ~/repos

diff --git a/cmd/clef/main.go b/cmd/clef/main.go
@@ -95,7 +95,7 @@ var (
 	chainIdFlag = cli.Int64Flag{
 		Name:  "chainid",
 		Value: params.MainnetChainConfig.ChainID.Int64(),
-		Usage: "Chain id to use for signing (1=mainnet, 3=Ropsten, 4=Rinkeby, 5=Goerli)",
+		Usage: fmt.Sprintf("Chain id to use for signing (%s)", params.NetworkIdHelp),
 	}
 	rpcPortFlag = cli.IntFlag{
 		Name:  "rpcport",

diff --git a/cmd/devp2p/discv4cmd.go b/cmd/devp2p/discv4cmd.go
@@ -22,12 +22,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/p2p/discover"
 	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/params"
 
 	"gopkg.in/urfave/cli.v1"
 )
@@ -181,7 +181,7 @@ func discv4Crawl(ctx *cli.Context) error {
 }
 
 func parseBootnodes(ctx *cli.Context) ([]*enode.Node, error) {
-	s := params.RinkebyBootnodes
+	s := utils.GetBootstrapNodes(ctx)
 	if ctx.IsSet(bootnodesFlag.Name) {
 		s = strings.Split(ctx.String(bootnodesFlag.Name), ",")
 	}

diff --git a/cmd/devp2p/nodesetcmd.go b/cmd/devp2p/nodesetcmd.go
@@ -159,12 +159,10 @@ func ethFilter(args []string) (nodeFilter, error) {
 	switch args[0] {
 	case "mainnet":
 		filter = forkid.NewStaticFilter(params.MainnetChainConfig, params.MainnetGenesisHash)
-	case "rinkeby":
-		filter = forkid.NewStaticFilter(params.RinkebyChainConfig, params.RinkebyGenesisHash)
-	case "goerli":
-		filter = forkid.NewStaticFilter(params.GoerliChainConfig, params.GoerliGenesisHash)
-	case "ropsten":
-		filter = forkid.NewStaticFilter(params.TestnetChainConfig, params.TestnetGenesisHash)
+	case "baklava":
+		filter = forkid.NewStaticFilter(params.BaklavaChainConfig, params.BaklavaGenesisHash)
+	case "alfajores":
+		filter = forkid.NewStaticFilter(params.AlfajoresChainConfig, params.AlfajoresGenesisHash)
 	default:
 		return nil, fmt.Errorf("unknown network %q", args[0])
 	}

diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
@@ -64,6 +64,8 @@ It expects the genesis file as argument.`,
 		ArgsUsage: "<filename> (<filename 2> ... <filename N>) ",
 		Flags: []cli.Flag{
 			utils.DataDirFlag,
+			utils.AlfajoresFlag,
+			utils.BaklavaFlag,
 			utils.CacheFlag,
 			utils.SyncModeFlag,
 			utils.GCModeFlag,
@@ -85,6 +87,8 @@ processing will proceed even if an individual RLP-file import failure occurs.`,
 		ArgsUsage: "<filename> [<blockNumFirst> <blockNumLast>]",
 		Flags: []cli.Flag{
 			utils.DataDirFlag,
+			utils.AlfajoresFlag,
+			utils.BaklavaFlag,
 			utils.CacheFlag,
 			utils.SyncModeFlag,
 		},
@@ -103,6 +107,8 @@ be gzipped.`,
 		ArgsUsage: "<datafile>",
 		Flags: []cli.Flag{
 			utils.DataDirFlag,
+			utils.AlfajoresFlag,
+			utils.BaklavaFlag,
 			utils.CacheFlag,
 			utils.SyncModeFlag,
 		},
@@ -117,6 +123,8 @@ be gzipped.`,
 		ArgsUsage: "<dumpfile>",
 		Flags: []cli.Flag{
 			utils.DataDirFlag,
+			utils.AlfajoresFlag,
+			utils.BaklavaFlag,
 			utils.CacheFlag,
 			utils.SyncModeFlag,
 		},
@@ -131,11 +139,11 @@ The export-preimages command export hash preimages to an RLP encoded stream`,
 		ArgsUsage: "<sourceChaindataDir>",
 		Flags: []cli.Flag{
 			utils.DataDirFlag,
+			utils.AlfajoresFlag,
+			utils.BaklavaFlag,
 			utils.CacheFlag,
 			utils.SyncModeFlag,
 			utils.FakePoWFlag,
-			utils.TestnetFlag,
-			utils.RinkebyFlag,
 		},
 		Category: "BLOCKCHAIN COMMANDS",
 		Description: `
@@ -148,6 +156,8 @@ The first argument must be the directory containing the blockchain to download f
 		ArgsUsage: " ",
 		Flags: []cli.Flag{
 			utils.DataDirFlag,
+			utils.AlfajoresFlag,
+			utils.BaklavaFlag,
 		},
 		Category: "BLOCKCHAIN COMMANDS",
 		Description: `
@@ -160,6 +170,8 @@ Remove blockchain and state databases`,
 		ArgsUsage: "[<blockHash> | <blockNum>]...",
 		Flags: []cli.Flag{
 			utils.DataDirFlag,
+			utils.AlfajoresFlag,
+			utils.BaklavaFlag,
 			utils.CacheFlag,
 			utils.SyncModeFlag,
 			utils.IterativeOutputFlag,
@@ -181,9 +193,6 @@ Use "ethereum dump 0" to dump the genesis block.`,
 			utils.DataDirFlag,
 			utils.AncientFlag,
 			utils.CacheFlag,
-			utils.TestnetFlag,
-			utils.RinkebyFlag,
-			utils.GoerliFlag,
 			utils.AlfajoresFlag,
 			utils.BaklavaFlag,
 			utils.SyncModeFlag,

diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go
@@ -123,11 +123,7 @@ func remoteConsole(ctx *cli.Context) error {
 			path = ctx.GlobalString(utils.DataDirFlag.Name)
 		}
 		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")
-			} else if ctx.GlobalBool(utils.BaklavaFlag.Name) {
+			if ctx.GlobalBool(utils.BaklavaFlag.Name) {
 				path = filepath.Join(path, "baklava")
 			} else if ctx.GlobalBool(utils.AlfajoresFlag.Name) {
 				path = filepath.Join(path, "alfajores")

diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -125,12 +125,8 @@ var (
 		utils.NodeKeyHexFlag,
 		utils.DeveloperFlag,
 		utils.DeveloperPeriodFlag,
-		utils.TestnetFlag,
-		utils.RinkebyFlag,
-		utils.GoerliFlag,
 		utils.BaklavaFlag,
 		utils.AlfajoresFlag,
-		utils.OttomanFlag,
 		utils.VMEnableDebugFlag,
 		utils.NetworkIdFlag,
 		utils.EthStatsURLFlag,
@@ -261,7 +257,7 @@ func prepare(ctx *cli.Context) {
 	// If we're a full node on mainnet without --cache specified, bump default cache allowance
 	if ctx.GlobalString(utils.SyncModeFlag.Name) != "light" && !ctx.GlobalIsSet(utils.CacheFlag.Name) && !ctx.GlobalIsSet(utils.NetworkIdFlag.Name) {
 		// Make sure we're not on any supported preconfigured testnet either
-		if !ctx.GlobalIsSet(utils.TestnetFlag.Name) && !ctx.GlobalIsSet(utils.RinkebyFlag.Name) && !ctx.GlobalIsSet(utils.GoerliFlag.Name) && !ctx.GlobalIsSet(utils.DeveloperFlag.Name) && !ctx.GlobalIsSet(utils.AlfajoresFlag.Name) && !ctx.GlobalIsSet(utils.BaklavaFlag.Name) {
+		if !ctx.GlobalIsSet(utils.DeveloperFlag.Name) && !ctx.GlobalIsSet(utils.AlfajoresFlag.Name) && !ctx.GlobalIsSet(utils.BaklavaFlag.Name) {
 			// Nope, we're really on mainnet. Bump that cache up!
 			log.Info("Bumping default cache on mainnet", "provided", ctx.GlobalInt(utils.CacheFlag.Name), "updated", 4096)
 			ctx.GlobalSet(utils.CacheFlag.Name, strconv.Itoa(4096))

diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
@@ -72,12 +72,8 @@ var AppHelpFlagGroups = []flagGroup{
 			utils.NoUSBFlag,
 			utils.SmartCardDaemonPathFlag,
 			utils.NetworkIdFlag,
-			utils.TestnetFlag,
-			utils.RinkebyFlag,
-			utils.GoerliFlag,
 			utils.BaklavaFlag,
 			utils.AlfajoresFlag,
-			utils.OttomanFlag,
 			utils.SyncModeFlag,
 			utils.ExitWhenSyncedFlag,
 			utils.GCModeFlag,