From e956ca641c345f4a26b63cdfb34727a314ba6f06 Mon Sep 17 00:00:00 2001
From: millken <millken@gmail.com>
Date: Thu, 7 Jul 2022 01:53:56 +0800
Subject: [PATCH] [config] remove  EVMNetworkID() and SetEVMNetworkID() (#3503)

Co-authored-by: dustinxie <dahuaxie@gmail.com>
---
 config/config.go      | 19 -------------------
 config/config_test.go |  2 --
 server/main.go        |  9 ++++-----
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/config/config.go b/config/config.go
index d4c1fa4e6b..3d663afd64 100644
--- a/config/config.go
+++ b/config/config.go
@@ -11,8 +11,6 @@ import (
 	"math/big"
 	"os"
 	"strings"
-	"sync"
-	"sync/atomic"
 	"time"
 
 	"github.com/iotexproject/go-pkgs/crypto"
@@ -34,11 +32,6 @@ import (
 // IMPORTANT: to define a config, add a field or a new config type to the existing config types. In addition, provide
 // the default value in Default var.
 
-var (
-	_evmNetworkID uint32
-	_loadChainID  sync.Once
-)
-
 const (
 	// RollDPoSScheme means randomized delegated proof of stake
 	RollDPoSScheme = "ROLLDPOS"
@@ -463,18 +456,6 @@ func NewSub(configPaths []string, validates ...Validate) (Config, error) {
 	return cfg, nil
 }
 
-// SetEVMNetworkID sets the extern chain ID
-func SetEVMNetworkID(id uint32) {
-	_loadChainID.Do(func() {
-		_evmNetworkID = id
-	})
-}
-
-// EVMNetworkID returns the extern chain ID
-func EVMNetworkID() uint32 {
-	return atomic.LoadUint32(&_evmNetworkID)
-}
-
 // ProducerAddress returns the configured producer address derived from key
 func (cfg Config) ProducerAddress() address.Address {
 	sk := cfg.ProducerPrivateKey()
diff --git a/config/config_test.go b/config/config_test.go
index 655d2990a1..e4f5a175e4 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -112,8 +112,6 @@ func TestStrs_String(t *testing.T) {
 func TestNewDefaultConfig(t *testing.T) {
 	cfg, err := New([]string{}, []string{})
 	require.NoError(t, err)
-	SetEVMNetworkID(cfg.Chain.EVMNetworkID)
-	require.Equal(t, cfg.Chain.EVMNetworkID, EVMNetworkID())
 	genesis.SetGenesisTimestamp(cfg.Genesis.Timestamp)
 	require.Equal(t, cfg.Genesis.Timestamp, genesis.Timestamp())
 }
diff --git a/server/main.go b/server/main.go
index 8847cc6966..29aadf78aa 100644
--- a/server/main.go
+++ b/server/main.go
@@ -108,10 +108,9 @@ func main() {
 	}
 	defer recovery.Recover()
 
-	// populdate chain ID
-	config.SetEVMNetworkID(cfg.Chain.EVMNetworkID)
-	if config.EVMNetworkID() == 0 {
-		glog.Fatalln("EVM Network ID is not set, call config.New() first")
+	// check EVM network ID and chain ID
+	if cfg.Chain.EVMNetworkID == 0 || cfg.Chain.ID == 0 {
+		glog.Fatalln("EVM Network ID or Chain ID is not set, call config.New() first")
 	}
 
 	cfg.Genesis = genesisCfg
@@ -119,7 +118,7 @@ func main() {
 	cfgToLog.Chain.ProducerPrivKey = ""
 	cfgToLog.Network.MasterKey = ""
 	log.S().Infof("Config in use: %+v", cfgToLog)
-	log.S().Infof("EVM Network ID: %d, Chain ID: %d", config.EVMNetworkID(), cfg.Chain.ID)
+	log.S().Infof("EVM Network ID: %d, Chain ID: %d", cfg.Chain.EVMNetworkID, cfg.Chain.ID)
 	log.S().Infof("Genesis timestamp: %d", genesisCfg.Timestamp)
 	log.S().Infof("Genesis hash: %x", block.GenesisHash())