Merge pull request ethereum#513 from maticnetwork/qa-flag-requiredblocks

Changed 'requiredblocks' flag back to 'eth.requiredblocks'
streamingfast · Sep 8, 2022 · 0969781 · 0969781
2 parents 7bb7bac + 2cf5945
commit 0969781
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -168,7 +168,7 @@ jobs:
           if: always()
           run: |
             cd matic-cli/devnet
-            docker compose down
+            docker compose down --remove-orphans
             cd -
             mkdir -p ${{ github.run_id }}/matic-cli
             sudo mv bor ${{ github.run_id }}

diff --git a/builder/files/config.toml b/builder/files/config.toml
@@ -12,7 +12,7 @@ syncmode = "full"
 # snapshot = true
 # ethstats = ""
 
-# [requiredblocks]
+# ["eth.requiredblocks"]
 
 [p2p]
   # maxpeers = 1

diff --git a/docs/config.md b/docs/config.md
@@ -19,6 +19,8 @@ gcmode = "full"
 snapshot = true
 ethstats = ""
 
+["eth.requiredblocks"]
+
 [p2p]
 maxpeers = 30
 maxpendpeers = 50

diff --git a/internal/cli/server/command_test.go b/internal/cli/server/command_test.go
@@ -24,7 +24,7 @@ func TestFlags(t *testing.T) {
 		"--dev.period", "2",
 		"--datadir", "./data",
 		"--maxpeers", "30",
-		"--requiredblocks", "a=b",
+		"--eth.requiredblocks", "a=b",
 		"--http.api", "eth,web3,bor",
 	}
 	err := c.extractFlags(args)

diff --git a/internal/cli/server/config.go b/internal/cli/server/config.go
@@ -45,7 +45,7 @@ type Config struct {
 	Identity string `hcl:"identity,optional" toml:"identity,optional"`
 
 	// RequiredBlocks is a list of required (block number, hash) pairs to accept
-	RequiredBlocks map[string]string `hcl:"requiredblocks,optional" toml:"requiredblocks,optional"`
+	RequiredBlocks map[string]string `hcl:"eth.requiredblocks,optional" toml:"eth.requiredblocks,optional"`
 
 	// LogLevel is the level of the logs to put out
 	LogLevel string `hcl:"log-level,optional" toml:"log-level,optional"`

diff --git a/internal/cli/server/config_test.go b/internal/cli/server/config_test.go
@@ -108,9 +108,6 @@ func TestConfigLoadFile(t *testing.T) {
 
 		assert.Equal(t, config, &Config{
 			DataDir: "./data",
-			RequiredBlocks: map[string]string{
-				"a": "b",
-			},
 			P2P: &P2PConfig{
 				MaxPeers: 30,
 			},

diff --git a/internal/cli/server/flags.go b/internal/cli/server/flags.go
@@ -56,7 +56,7 @@ func (c *Command) Flags() *flagset.Flagset {
 		Default: c.cliConfig.GcMode,
 	})
 	f.MapStringFlag(&flagset.MapStringFlag{
-		Name:  "requiredblocks",
+		Name:  "eth.requiredblocks",
 		Usage: "Comma separated block number-to-hash mappings to enforce (<number>=<hash>)",
 		Value: &c.cliConfig.RequiredBlocks,
 	})

diff --git a/internal/cli/server/testdata/test.hcl b/internal/cli/server/testdata/test.hcl
@@ -1,9 +1,5 @@
 datadir = "./data"
 
-requiredblocks = {
-	a = "b"
-}
-
 p2p {
 	maxpeers = 30
 }

diff --git a/internal/cli/server/testdata/test.json b/internal/cli/server/testdata/test.json
@@ -1,8 +1,5 @@
 {
   "datadir": "./data",
-  "requiredblocks": {
-      "a": "b"
-  },
   "p2p": {
       "maxpeers": 30
   },

diff --git a/internal/cli/server/testdata/test.toml b/internal/cli/server/testdata/test.toml
@@ -1,6 +1,6 @@
 datadir = "./data"
 
-[requiredblocks]
+["eth.requiredblocks"]
 a = "b"
 
 [p2p]