cmd/geth,eth,eth/ethconfig: rename config field ECBP1100 -> OverrideE…

…CBP1100 Date: 2024-02-05 11:00:37-07:00 Signed-off-by: meows <[email protected]>
etclabscore · Feb 5, 2024 · 82ebc79 · 82ebc79
1 parent 0ae1b04
commit 82ebc79
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/cmd/geth/config.go b/cmd/geth/config.go
@@ -170,7 +170,7 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 	stack, cfg := makeConfigNode(ctx)
 	if ctx.IsSet(utils.ECBP1100Flag.Name) {
 		if n := ctx.Uint64(utils.ECBP1100Flag.Name); n != math.MaxUint64 {
-			cfg.Eth.ECBP1100 = &n
+			cfg.Eth.OverrideECBP1100 = &n
 		}
 	}
 	if ctx.IsSet(utils.ECBP1100NoDisableFlag.Name) {

diff --git a/eth/backend.go b/eth/backend.go
@@ -230,7 +230,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 	}
 	eth.bloomIndexer.Start(eth.blockchain)
 	// Handle artificial finality config override cases.
-	if n := config.ECBP1100; n != nil {
+	if n := config.OverrideECBP1100; n != nil {
 		if err := eth.blockchain.Config().SetECBP1100Transition(n); err != nil {
 			return nil, err
 		}

diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go
@@ -216,7 +216,7 @@ type Config struct {
 	CheckpointOracle *ctypes.CheckpointOracleConfig `toml:",omitempty"`
 
 	// Manual configuration field for ECBP1100 activation number. Used for modifying genesis config via CLI flag.
-	ECBP1100 *uint64 `toml:",omitempty"`
+	OverrideECBP1100 *uint64 `toml:",omitempty"`
 	// Manual configuration field for ECBP1100's disablement block number. Used for modifying genesis config via CLI flag.
 	OverrideECBP1100Deactivate *uint64 `toml:",omitempty"`
 

diff --git a/eth/ethconfig/gen_config.go b/eth/ethconfig/gen_config.go