[config] Clean up config (#3492)

* clean up config

action/protocol/account/protocol_test.go

@@ -19,7 +19,6 @@ import (
 	accountutil "github.com/iotexproject/iotex-core/action/protocol/account/util"
 	"github.com/iotexproject/iotex-core/action/protocol/rewarding"
 	"github.com/iotexproject/iotex-core/blockchain/genesis"
-	"github.com/iotexproject/iotex-core/config"
 	"github.com/iotexproject/iotex-core/db/batch"
 	"github.com/iotexproject/iotex-core/state"
 	"github.com/iotexproject/iotex-core/test/identityset"
@@ -102,7 +101,7 @@ func TestProtocol_Initialize(t *testing.T) {
 			return 0, nil
 		}).AnyTimes()
 
-	ge := config.Default.Genesis
+	ge := genesis.Default
 	ge.Account.InitBalanceMap = map[string]string{
 		identityset.Address(0).String(): "100",
 	}

action/protocol/account/transfer_test.go

@@ -24,7 +24,6 @@ import (
 	"github.com/iotexproject/iotex-core/action/protocol/rewarding"
 	"github.com/iotexproject/iotex-core/blockchain/block"
 	"github.com/iotexproject/iotex-core/blockchain/genesis"
-	"github.com/iotexproject/iotex-core/config"
 	"github.com/iotexproject/iotex-core/state"
 	"github.com/iotexproject/iotex-core/test/identityset"
 	"github.com/iotexproject/iotex-core/testutil"
@@ -63,12 +62,12 @@ func TestProtocol_HandleTransfer(t *testing.T) {
 
 	// set-up protocol and genesis states
 	p := NewProtocol(rewarding.DepositGas)
-	reward := rewarding.NewProtocol(config.Default.Genesis.Rewarding)
+	reward := rewarding.NewProtocol(genesis.Default.Rewarding)
 	registry := protocol.NewRegistry()
 	require.NoError(reward.Register(registry))
 	chainCtx := genesis.WithGenesisContext(
 		protocol.WithRegistry(context.Background(), registry),
-		config.Default.Genesis,
+		genesis.Default,
 	)
 	ctx := protocol.WithBlockCtx(chainCtx, protocol.BlockCtx{})
 	ctx = protocol.WithFeatureCtx(ctx)

action/protocol/generic_validator_test.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/iotexproject/iotex-core/action"
 	"github.com/iotexproject/iotex-core/blockchain/genesis"
-	"github.com/iotexproject/iotex-core/config"
 	"github.com/iotexproject/iotex-core/state"
 	"github.com/iotexproject/iotex-core/test/identityset"
 )
@@ -53,13 +52,13 @@ func TestActionProtoAndGenericValidator(t *testing.T) {
 		BlockchainCtx{
 			Tip: TipInfo{
 				Height:    0,
-				Hash:      config.Default.Genesis.Hash(),
-				Timestamp: time.Unix(config.Default.Genesis.Timestamp, 0),
+				Hash:      genesis.Default.Hash(),
+				Timestamp: time.Unix(genesis.Default.Timestamp, 0),
 			},
 		},
 	)
 
-	ctx = WithFeatureCtx(genesis.WithGenesisContext(ctx, config.Default.Genesis))
+	ctx = WithFeatureCtx(genesis.WithGenesisContext(ctx, genesis.Default))
 
 	valid := NewGenericValidator(nil, func(_ context.Context, sr StateReader, addr address.Address) (*state.Account, error) {
 		pk := identityset.PrivateKey(27).PublicKey()

action/protocol/poll/lifelong_protocol_test.go

@@ -16,14 +16,13 @@ import (
 	"github.com/iotexproject/iotex-core/action/protocol"
 	"github.com/iotexproject/iotex-core/action/protocol/rolldpos"
 	"github.com/iotexproject/iotex-core/blockchain/genesis"
-	"github.com/iotexproject/iotex-core/config"
 	"github.com/iotexproject/iotex-core/db/batch"
 	"github.com/iotexproject/iotex-core/state"
 	"github.com/iotexproject/iotex-core/test/mock/mock_chainmanager"
 )
 
 func initLifeLongDelegateProtocol(ctrl *gomock.Controller) (Protocol, context.Context, protocol.StateManager, error) {
-	genesisConfig := config.Default.Genesis
+	genesisConfig := genesis.Default
 	delegates := genesisConfig.Delegates
 	p := NewLifeLongDelegatesProtocol(delegates)
 	registry := protocol.NewRegistry()
@@ -33,7 +32,7 @@ func initLifeLongDelegateProtocol(ctrl *gomock.Controller) (Protocol, context.Co
 	}
 	ctx := genesis.WithGenesisContext(
 		protocol.WithRegistry(context.Background(), registry),
-		config.Default.Genesis,
+		genesis.Default,
 	)
 	ctx = protocol.WithActionCtx(
 		ctx,

action/protocol/poll/staking_committee_test.go

@@ -53,7 +53,7 @@ func initConstructStakingCommittee(ctrl *gomock.Controller) (Protocol, context.C
 	}
 	ctx = genesis.WithGenesisContext(
 		protocol.WithRegistry(ctx, registry),
-		config.Default.Genesis,
+		genesis.Default,
 	)
 	ctx = protocol.WithBlockchainCtx(ctx, protocol.BlockchainCtx{})
 	ctx = protocol.WithActionCtx(

action/protocol/rewarding/protocol_test.go

@@ -25,7 +25,6 @@ import (
 	"github.com/iotexproject/iotex-core/action/protocol/poll"
 	"github.com/iotexproject/iotex-core/action/protocol/rolldpos"
 	"github.com/iotexproject/iotex-core/blockchain/genesis"
-	"github.com/iotexproject/iotex-core/config"
 	"github.com/iotexproject/iotex-core/db/batch"
 	"github.com/iotexproject/iotex-core/pkg/unit"
 	"github.com/iotexproject/iotex-core/state"
@@ -38,7 +37,7 @@ import (
 func TestValidateExtension(t *testing.T) {
 	r := require.New(t)
 
-	g := config.Default.Genesis.Rewarding
+	g := genesis.Default.Rewarding
 	r.NoError(validateFoundationBonusExtension(g))
 
 	last := g.FoundationBonusP2StartEpoch
@@ -58,7 +57,7 @@ func testProtocol(t *testing.T, test func(*testing.T, context.Context, protocol.
 	registry := protocol.NewRegistry()
 	sm := testdb.NewMockStateManager(ctrl)
 
-	g := config.Default.Genesis
+	g := genesis.Default
 	// Create a test account with 1000 token
 	g.InitBalanceMap[identityset.Address(28).String()] = "1000"
 	g.Rewarding.InitBalanceStr = "0"
@@ -220,7 +219,7 @@ func testProtocol(t *testing.T, test func(*testing.T, context.Context, protocol.
 }
 
 func TestProtocol_Validate(t *testing.T) {
-	g := config.Default.Genesis
+	g := genesis.Default
 	g.NewfoundlandBlockHeight = 0
 	p := NewProtocol(g.Rewarding)
 	act := createGrantRewardAction(0, uint64(0)).Action()
@@ -274,7 +273,7 @@ func TestProtocol_Validate(t *testing.T) {
 func TestProtocol_Handle(t *testing.T) {
 	ctrl := gomock.NewController(t)
 
-	g := config.Default.Genesis
+	g := genesis.Default
 	registry := protocol.NewRegistry()
 	sm := mock_chainmanager.NewMockStateManager(ctrl)
 	cb := batch.NewCachedBatch()

action/protocol/rewarding/reward_test.go

@@ -331,7 +331,7 @@ func TestProtocol_NoRewardAddr(t *testing.T) {
 		}).AnyTimes()
 	sm.EXPECT().Height().Return(uint64(1), nil).AnyTimes()
 
-	ge := config.Default.Genesis
+	ge := genesis.Default
 	ge.Rewarding.InitBalanceStr = "0"
 	ge.Rewarding.BlockRewardStr = "10"
 	ge.Rewarding.EpochRewardStr = "100"

blockchain/block/genesis_block_test.go

@@ -14,14 +14,13 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/iotexproject/iotex-core/blockchain/genesis"
-	"github.com/iotexproject/iotex-core/config"
 	"github.com/iotexproject/iotex-core/pkg/version"
 )
 
 func TestGenesisBlock(t *testing.T) {
 	r := require.New(t)
 
-	g := config.Default.Genesis
+	g := genesis.Default
 	genesis.SetGenesisTimestamp(g.Timestamp)
 	blk := GenesisBlock()
 	r.EqualValues(version.ProtocolVersion, blk.Version())

blockchain/blockdao/blockdao_test.go

@@ -177,7 +177,7 @@ func TestBlockDAO(t *testing.T) {
 
 	testBlockDao := func(dao BlockDAO, t *testing.T) {
 		ctx := protocol.WithBlockchainCtx(
-			genesis.WithGenesisContext(context.Background(), config.Default.Genesis),
+			genesis.WithGenesisContext(context.Background(), genesis.Default),
 			protocol.BlockchainCtx{
 				ChainID: config.Default.Chain.ID,
 			})
@@ -290,7 +290,7 @@ func TestBlockDAO(t *testing.T) {
 
 	testDeleteDao := func(dao BlockDAO, t *testing.T) {
 		ctx := protocol.WithBlockchainCtx(
-			genesis.WithGenesisContext(context.Background(), config.Default.Genesis),
+			genesis.WithGenesisContext(context.Background(), genesis.Default),
 			protocol.BlockchainCtx{
 				ChainID: config.Default.Chain.ID,
 			})
@@ -414,8 +414,8 @@ func TestBlockDAO(t *testing.T) {
 
 	cfg := db.DefaultConfig
 	cfg.DbPath = testPath
-	genesis.SetGenesisTimestamp(config.Default.Genesis.Timestamp)
-	block.LoadGenesisHash(&config.Default.Genesis)
+	genesis.SetGenesisTimestamp(genesis.Default.Timestamp)
+	block.LoadGenesisHash(&genesis.Default)
 	for _, v := range daoList {
 		testutil.CleanupPath(testPath)
 		dao, err := createTestBlockDAO(v.inMemory, v.legacy, v.compressBlock, cfg)

blockchain/filedao/filedao_legacy_test.go

@@ -76,8 +76,8 @@ func TestFileDAOLegacy_PutBlock(t *testing.T) {
 
 	cfg := db.DefaultConfig
 	cfg.DbPath = testPath
-	genesis.SetGenesisTimestamp(config.Default.Genesis.Timestamp)
-	block.LoadGenesisHash(&config.Default.Genesis)
+	genesis.SetGenesisTimestamp(genesis.Default.Timestamp)
+	block.LoadGenesisHash(&genesis.Default)
 	for _, compress := range []bool{false, true} {
 		cfg.CompressLegacy = compress
 		t.Run("test fileDAOLegacy interface", func(t *testing.T) {

blockchain/filedao/filedao_v2_test.go

@@ -261,8 +261,8 @@ func TestNewFdInterface(t *testing.T) {
 	deser := block.NewDeserializer(config.Default.Chain.EVMNetworkID)
 	_, err = newFileDAOv2(0, cfg, deser)
 	r.Equal(ErrNotSupported, err)
-	genesis.SetGenesisTimestamp(config.Default.Genesis.Timestamp)
-	block.LoadGenesisHash(&config.Default.Genesis)
+	genesis.SetGenesisTimestamp(genesis.Default.Timestamp)
+	block.LoadGenesisHash(&genesis.Default)
 
 	for _, compress := range []string{"", compress.Snappy} {
 		for _, start := range []uint64{1, 5, _blockStoreBatchSize + 1, 4 * _blockStoreBatchSize} {

blockchain/filedao/testing.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/iotexproject/iotex-core/action"
 	"github.com/iotexproject/iotex-core/blockchain/block"
+	"github.com/iotexproject/iotex-core/blockchain/genesis"
 	"github.com/iotexproject/iotex-core/config"
 	"github.com/iotexproject/iotex-core/db"
 	"github.com/iotexproject/iotex-core/db/batch"
@@ -223,7 +224,7 @@ func testVerifyChainDB(t *testing.T, fd FileDAO, start, end uint64) {
 }
 
 func createTestingBlock(builder *block.TestingBuilder, height uint64, h hash.Hash256) *block.Block {
-	block.LoadGenesisHash(&config.Default.Genesis)
+	block.LoadGenesisHash(&genesis.Default)
 	r := &action.Receipt{
 		Status:      1,
 		BlockHeight: height,

blockchain/integrity/benchmark_test.go

@@ -31,6 +31,7 @@ import (
 	"github.com/iotexproject/iotex-core/blockchain"
 	"github.com/iotexproject/iotex-core/blockchain/block"
 	"github.com/iotexproject/iotex-core/blockchain/blockdao"
+	"github.com/iotexproject/iotex-core/blockchain/genesis"
 	"github.com/iotexproject/iotex-core/blockindex"
 	"github.com/iotexproject/iotex-core/config"
 	"github.com/iotexproject/iotex-core/db"
@@ -220,7 +221,7 @@ func newChainInDB() (blockchain.Blockchain, actpool.ActPool, error) {
 	cfg.Chain.IndexDBPath = testIndexPath
 	cfg.Chain.EnableArchiveMode = true
 	cfg.Consensus.Scheme = config.RollDPoSScheme
-	cfg.Genesis.BlockGasLimit = config.Default.Genesis.BlockGasLimit * 100
+	cfg.Genesis.BlockGasLimit = genesis.Default.BlockGasLimit * 100
 	cfg.ActPool.MinGasPriceStr = "0"
 	cfg.ActPool.MaxNumActsPerAcct = 1000000000
 	cfg.Genesis.EnableGravityChainVoting = false

blockchain/integrity/integrity_test.go

@@ -523,7 +523,7 @@ func TestGetBlockHash(t *testing.T) {
 	cfg.Genesis.MidwayBlockHeight = 9
 	cfg.ActPool.MinGasPriceStr = "0"
 	genesis.SetGenesisTimestamp(cfg.Genesis.Timestamp)
-	block.LoadGenesisHash(&config.Default.Genesis)
+	block.LoadGenesisHash(&genesis.Default)
 	// create chain
 	registry := protocol.NewRegistry()
 	acc := account.NewProtocol(rewarding.DepositGas)
@@ -1323,7 +1323,7 @@ func TestLoadBlockchainfromDB(t *testing.T) {
 	cfg.Genesis.EnableGravityChainVoting = false
 	cfg.ActPool.MinGasPriceStr = "0"
 	genesis.SetGenesisTimestamp(cfg.Genesis.Timestamp)
-	block.LoadGenesisHash(&config.Default.Genesis)
+	block.LoadGenesisHash(&genesis.Default)
 
 	t.Run("load blockchain from DB w/o explorer", func(t *testing.T) {
 		testValidateBlockchain(cfg, t)

config/config.go

@@ -362,7 +362,7 @@ type (
 	// Config is the root config struct, each package's config should be put as its sub struct
 	Config struct {
 		Plugins            map[int]interface{}         `ymal:"plugins"`
-		Network            p2p.Network                 `yaml:"network"`
+		Network            p2p.Config                  `yaml:"network"`
 		Chain              Chain                       `yaml:"chain"`
 		ActPool            ActPool                     `yaml:"actPool"`
 		Consensus          Consensus                   `yaml:"consensus"`

consensus/scheme/rolldpos/rolldposctx_test.go

@@ -49,9 +49,9 @@ func TestRollDPoSCtx(t *testing.T) {
 	})
 
 	rp := rolldpos.NewProtocol(
-		config.Default.Genesis.NumCandidateDelegates,
-		config.Default.Genesis.NumDelegates,
-		config.Default.Genesis.NumSubEpochs,
+		genesis.Default.NumCandidateDelegates,
+		genesis.Default.NumDelegates,
+		genesis.Default.NumSubEpochs,
 	)
 	t.Run("case 3:panic because of clock is nil", func(t *testing.T) {
 		_, err := newRollDPoSCtx(consensusfsm.NewConsensusConfig(cfg), dbConfig, true, time.Second, true, b, block.NewDeserializer(0), rp, nil, dummyCandidatesByHeightFunc, "", nil, nil, 0)
@@ -75,7 +75,7 @@ func TestRollDPoSCtx(t *testing.T) {
 	})
 
 	t.Run("case 6:normal", func(t *testing.T) {
-		bh := config.Default.Genesis.BeringBlockHeight
+		bh := genesis.Default.BeringBlockHeight
 		rctx, err := newRollDPoSCtx(consensusfsm.NewConsensusConfig(cfg), dbConfig, true, time.Second, true, b, block.NewDeserializer(0), rp, nil, dummyCandidatesByHeightFunc, "", nil, c, bh)
 		require.NoError(err)
 		require.Equal(bh, rctx.roundCalc.beringHeight)
@@ -139,7 +139,7 @@ func TestCheckVoteEndorser(t *testing.T) {
 		"",
 		nil,
 		c,
-		config.Default.Genesis.BeringBlockHeight,
+		genesis.Default.BeringBlockHeight,
 	)
 	require.NoError(err)
 	require.NotNil(rctx)
@@ -212,7 +212,7 @@ func TestCheckBlockProposer(t *testing.T) {
 		"",
 		nil,
 		c,
-		config.Default.Genesis.BeringBlockHeight,
+		genesis.Default.BeringBlockHeight,
 	)
 	require.NoError(err)
 	require.NotNil(rctx)
@@ -324,7 +324,7 @@ func TestNotProducingMultipleBlocks(t *testing.T) {
 		"",
 		identityset.PrivateKey(10),
 		c,
-		config.Default.Genesis.BeringBlockHeight,
+		genesis.Default.BeringBlockHeight,
 	)
 	require.NoError(err)
 	require.NotNil(rctx)

consensus/scheme/rolldpos/roundcalculator_test.go

@@ -244,7 +244,7 @@ func makeRoundCalculator(t *testing.T) *roundCalculator {
 						},
 					},
 				),
-				config.Default.Genesis,
+				genesis.Default,
 			)
 			tipEpochNum := rp.GetEpochNum(tipHeight)
 			var candidatesList state.CandidateList

e2etest/local_test.go

@@ -332,7 +332,7 @@ func TestLocalSync(t *testing.T) {
 	// bootnode
 	ctx := context.Background()
 	bootnodePort := testutil.RandomPort()
-	bootnode := p2p.NewAgent(p2p.Network{
+	bootnode := p2p.NewAgent(p2p.Config{
 		Host:              "127.0.0.1",
 		Port:              bootnodePort,
 		ReconnectInterval: 150 * time.Second},

ioctl/config/config.go

@@ -13,7 +13,7 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/iotexproject/iotex-core/config"
+	"github.com/iotexproject/iotex-core/blockchain/genesis"
 	"github.com/iotexproject/iotex-core/ioctl/output"
 	"github.com/iotexproject/iotex-core/pkg/log"
 )
@@ -106,7 +106,7 @@ func init() {
 		completeness = false
 	}
 	if ReadConfig.Nsv2height == 0 {
-		ReadConfig.Nsv2height = config.Default.Genesis.FairbankBlockHeight
+		ReadConfig.Nsv2height = genesis.Default.FairbankBlockHeight
 	}
 	if ReadConfig.AnalyserEndpoint == "" {
 		ReadConfig.AnalyserEndpoint = _defaultAnalyserEndpoint