Merge pull request ethereum#419 from cffls/v0.3.0-dev-flags

CLI improvements
streamingfast · Jun 7, 2022 · 8808c23 · 8808c23
2 parents 0d2b1d0 + 96ac8d1
commit 8808c23
Show file tree

Hide file tree

Showing 7 changed files with 481 additions and 298 deletions.
diff --git a/internal/cli/server/chains/chain.go b/internal/cli/server/chains/chain.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/log"
 )
 
 type Chain struct {
@@ -59,5 +60,19 @@ func importChain(content []byte) (*Chain, error) {
 		return nil, err
 	}
 
+	if chain.Genesis == nil {
+		log.Info("Try reading as legacy genesis")
+		var genesis core.Genesis
+		if err := json.Unmarshal(content, &genesis); err != nil {
+			return nil, err
+		}
+		if genesis.Config != nil {
+			chain.Genesis = &genesis
+			chain.NetworkId = genesis.Config.ChainID.Uint64()
+		} else {
+			return nil, fmt.Errorf("unable to parse chain config")
+		}
+	}
+
 	return chain, nil
 }
diff --git a/internal/cli/server/chains/chain_test.go b/internal/cli/server/chains/chain_test.go
@@ -18,6 +18,16 @@ func TestChain_ImportFromFile(t *testing.T) {
 			args:    args{filename: "test_files/chain_test.json"},
 			wantErr: false,
 		},
+		{
+			name:    "ImportFromFile correct legacy json file",
+			args:    args{filename: "test_files/chain_legacy_test.json"},
+			wantErr: false,
+		},
+		{
+			name:    "ImportFromFile wrong json file",
+			args:    args{filename: "test_files/wrong_chain.json"},
+			wantErr: true,
+		},
 		{
 			name:    "ImportFromFile nonexistent json file",
 			args:    args{filename: "test_files/chain_test_nonexistent.json"},

diff --git a/internal/cli/server/chains/test_files/chain_legacy_test.json b/internal/cli/server/chains/test_files/chain_legacy_test.json
diff --git a/internal/cli/server/chains/test_files/wrong_chain.json b/internal/cli/server/chains/test_files/wrong_chain.json
@@ -0,0 +1 @@
+{}
diff --git a/internal/cli/server/config.go b/internal/cli/server/config.go
@@ -935,9 +935,15 @@ func (c *Config) buildNode() (*node.Config, error) {
 		if cfg.P2P.StaticNodes, err = parseBootnodes(c.P2P.Discovery.StaticNodes); err != nil {
 			return nil, err
 		}
+		if len(cfg.P2P.StaticNodes) == 0 {
+			cfg.P2P.StaticNodes = cfg.StaticNodes()
+		}
 		if cfg.P2P.TrustedNodes, err = parseBootnodes(c.P2P.Discovery.TrustedNodes); err != nil {
 			return nil, err
 		}
+		if len(cfg.P2P.TrustedNodes) == 0 {
+			cfg.P2P.TrustedNodes = cfg.TrustedNodes()
+		}
 	}
 
 	if c.P2P.NoDiscover {
@@ -950,14 +956,9 @@ func (c *Config) buildNode() (*node.Config, error) {
 
 func (c *Config) Merge(cc ...*Config) error {
 	for _, elem := range cc {
-		if err := mergo.Merge(c, elem, mergo.WithOverride, mergo.WithAppendSlice); err != nil {
+		if err := mergo.Merge(c, elem, mergo.WithOverwriteWithEmptyValue, mergo.WithAppendSlice); err != nil {
 			return fmt.Errorf("failed to merge configurations: %v", err)
 		}
-
-		// override max peers
-		if elem.P2P.MaxPeers == 0 {
-			c.P2P.MaxPeers = 0
-		}
 	}
 	return nil
 }

diff --git a/internal/cli/server/config_test.go b/internal/cli/server/config_test.go
@@ -54,14 +54,11 @@ func TestConfigMerge(t *testing.T) {
 	}
 	expected := &Config{
 		Chain:      "1",
-		NoSnapshot: true,
+		NoSnapshot: false,
 		RequiredBlocks: map[string]string{
 			"a": "b",
 			"b": "c",
 		},
-		TxPool: &TxPoolConfig{
-			LifeTime: 5 * time.Second,
-		},
 		P2P: &P2PConfig{
 			MaxPeers: 10,
 			Discovery: &P2PDiscovery{