From 22411919da72d6f274ad88992ab6bea61cc4336a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 2 Jul 2019 14:14:59 +0300
Subject: cmd, eth, les, param: drop --override.constantinople

---
 eth/backend.go    | 2 +-
 eth/config.go     | 3 ---
 eth/gen_config.go | 5 -----
 3 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'eth')

diff --git a/eth/backend.go b/eth/backend.go
index 9f6b5a002..a3275caca 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -134,7 +134,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 	if err != nil {
 		return nil, err
 	}
-	chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, config.ConstantinopleOverride)
+	chainConfig, genesisHash, genesisErr := core.SetupGenesisBlock(chainDb, config.Genesis)
 	if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok {
 		return nil, genesisErr
 	}
diff --git a/eth/config.go b/eth/config.go
index eb61f1d5d..a5913442d 100644
--- a/eth/config.go
+++ b/eth/config.go
@@ -144,9 +144,6 @@ type Config struct {
 	// Type of the EVM interpreter ("" for default)
 	EVMInterpreter string
 
-	// Constantinople block override (TODO: remove after the fork)
-	ConstantinopleOverride *big.Int
-
 	// RPCGasCap is the global gas cap for eth-call variants.
 	RPCGasCap *big.Int `toml:",omitempty"`
 
diff --git a/eth/gen_config.go b/eth/gen_config.go
index 77b28d025..d76499943 100644
--- a/eth/gen_config.go
+++ b/eth/gen_config.go
@@ -78,7 +78,6 @@ func (c Config) MarshalTOML() (interface{}, error) {
 	enc.DocRoot = c.DocRoot
 	enc.EWASMInterpreter = c.EWASMInterpreter
 	enc.EVMInterpreter = c.EVMInterpreter
-	enc.ConstantinopleOverride = c.ConstantinopleOverride
 	enc.RPCGasCap = c.RPCGasCap
 	enc.Checkpoint = c.Checkpoint
 	enc.CheckpointOracle = c.CheckpointOracle
@@ -115,7 +114,6 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error {
 		DocRoot                 *string `toml:"-"`
 		EWASMInterpreter        *string
 		EVMInterpreter          *string
-		ConstantinopleOverride  *big.Int
 		RPCGasCap               *big.Int `toml:",omitempty"`
 		Checkpoint              *params.TrustedCheckpoint
 		CheckpointOracle        *params.CheckpointOracleConfig
@@ -205,9 +203,6 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error {
 	if dec.EVMInterpreter != nil {
 		c.EVMInterpreter = *dec.EVMInterpreter
 	}
-	if dec.ConstantinopleOverride != nil {
-		c.ConstantinopleOverride = dec.ConstantinopleOverride
-	}
 	if dec.RPCGasCap != nil {
 		c.RPCGasCap = dec.RPCGasCap
 	}
-- 
cgit v1.2.3