refactor: add comments, rename functions and refactor init test chain…

… function

api/accounts/accounts_test.go

@@ -280,7 +280,7 @@ func getStorageWithNonExistingRevision(t *testing.T) {
 }
 
 func initAccountServer(t *testing.T, enabledDeprecated bool) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	genesisBlock = thorChain.GenesisBlock()

api/admin/health/health_api_test.go

@@ -34,7 +34,7 @@ func TestHealth(t *testing.T) {
 }
 
 func initAPIServer(t *testing.T) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	router := mux.NewRouter()

api/blocks/blocks_test.go

@@ -231,7 +231,7 @@ func initBlockServer(t *testing.T) {
 		GALACTICA: 1,
 		VIP214:    2,
 	}
-	thorChain, err := testchain.NewIntegrationTestChainWithFork(forks)
+	thorChain, err := testchain.NewIntegrationTestChain(forks)
 	require.NoError(t, err)
 
 	addr := thor.BytesToAddress([]byte("to"))

api/debug/debug_test.go

@@ -540,7 +540,7 @@ func initDebugServer(t *testing.T) {
 		GALACTICA: 1,
 		VIP214:    2,
 	}
-	thorChain, err := testchain.NewIntegrationTestChainWithFork(forkConf)
+	thorChain, err := testchain.NewIntegrationTestChain(forkConf)
 	require.NoError(t, err)
 
 	addr := thor.BytesToAddress([]byte("to"))

api/events/events_test.go

@@ -178,7 +178,7 @@ func testEventWithBlocks(t *testing.T, expectedBlocks int) {
 
 // Init functions
 func initEventServer(t *testing.T, limit uint64) *testchain.Chain {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	router := mux.NewRouter()

api/metrics_test.go

@@ -34,7 +34,7 @@ func init() {
 }
 
 func TestMetricsMiddleware(t *testing.T) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	// inject some invalid data to db
@@ -99,7 +99,7 @@ func TestMetricsMiddleware(t *testing.T) {
 }
 
 func TestWebsocketMetrics(t *testing.T) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	router := mux.NewRouter()

api/node/node_test.go

@@ -32,7 +32,7 @@ func TestNode(t *testing.T) {
 }
 
 func initCommServer(t *testing.T) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	communicator := comm.New(

api/subscriptions/beat2_reader_test.go

@@ -47,10 +47,11 @@ func TestBeat2Reader_Read_NoNewBlocksToRead(t *testing.T) {
 	thorChain := initChain(t)
 	allBlocks, err := thorChain.GetAllBlocks()
 	require.NoError(t, err)
-	newBlock := allBlocks[2]
+	// taking best block to include also galactica block
+	bestBlk := allBlocks[len(allBlocks)-1]
 
 	// Act
-	beatReader := newBeat2Reader(thorChain.Repo(), newBlock.Header().ID(), newMessageCache[Beat2Message](10))
+	beatReader := newBeat2Reader(thorChain.Repo(), bestBlk.Header().ID(), newMessageCache[Beat2Message](10))
 	res, ok, err := beatReader.Read()
 
 	// Assert

api/subscriptions/beat_reader_test.go

@@ -44,10 +44,11 @@ func TestBeatReader_Read_NoNewBlocksToRead(t *testing.T) {
 	thorChain := initChain(t)
 	allBlocks, err := thorChain.GetAllBlocks()
 	require.NoError(t, err)
-	newBlock := allBlocks[len(allBlocks)-1]
+	// taking best block to include also galactica block
+	bestBlock := allBlocks[len(allBlocks)-1]
 
 	// Act
-	beatReader := newBeatReader(thorChain.Repo(), newBlock.Header().ID(), newMessageCache[BeatMessage](10))
+	beatReader := newBeatReader(thorChain.Repo(), bestBlock.Header().ID(), newMessageCache[BeatMessage](10))
 	res, ok, err := beatReader.Read()
 
 	// Assert

api/subscriptions/block_reader_test.go

@@ -75,7 +75,7 @@ func initChain(t *testing.T) *testchain.Chain {
 		GALACTICA: 1,
 		VIP214:    2,
 	}
-	thorChain, err := testchain.NewIntegrationTestChainWithFork(forks)
+	thorChain, err := testchain.NewIntegrationTestChain(forks)
 	require.NoError(t, err)
 
 	addr := thor.BytesToAddress([]byte("to"))

api/subscriptions/event_reader_test.go

@@ -20,7 +20,8 @@ func TestEventReader_Read(t *testing.T) {
 	allBlocks, err := thorChain.GetAllBlocks()
 	require.NoError(t, err)
 	genesisBlk := allBlocks[0]
-	newBlock := allBlocks[len(allBlocks)-1]
+	// taking best block to include also galactica block
+	bestBlk := allBlocks[len(allBlocks)-1]
 
 	er := &eventReader{
 		repo:        thorChain.Repo(),
@@ -57,8 +58,8 @@ func TestEventReader_Read(t *testing.T) {
 	}
 	assert.Equal(t, 2, len(eventMessages))
 	eventMsg := eventMessages[0]
-	assert.Equal(t, newBlock.Header().ID(), eventMsg.Meta.BlockID)
-	assert.Equal(t, newBlock.Header().Number(), eventMsg.Meta.BlockNumber)
+	assert.Equal(t, bestBlk.Header().ID(), eventMsg.Meta.BlockID)
+	assert.Equal(t, bestBlk.Header().Number(), eventMsg.Meta.BlockNumber)
 }
 
 type mockBlockReaderWithError struct{}

api/subscriptions/subscriptions_test.go

@@ -228,7 +228,7 @@ func TestParseAddress(t *testing.T) {
 }
 
 func initSubscriptionsServer(t *testing.T, enabledDeprecated bool) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	txPool := txpool.New(thorChain.Repo(), thorChain.Stater(), txpool.Options{
@@ -280,7 +280,7 @@ func initSubscriptionsServer(t *testing.T, enabledDeprecated bool) {
 }
 
 func TestSubscriptionsBacktrace(t *testing.T) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	txPool := txpool.New(thorChain.Repo(), thorChain.Stater(), txpool.Options{

api/subscriptions/transfer_reader_test.go

@@ -45,11 +45,12 @@ func TestTransferReader_Read_NoNewBlocksToRead(t *testing.T) {
 	thorChain := initChain(t)
 	allBlocks, err := thorChain.GetAllBlocks()
 	require.NoError(t, err)
-	newBlock := allBlocks[len(allBlocks)-1]
+	// taking best block to include also galactica block
+	bestBlk := allBlocks[len(allBlocks)-1]
 	filter := &TransferFilter{}
 
 	// Act
-	br := newTransferReader(thorChain.Repo(), newBlock.Header().ID(), filter)
+	br := newTransferReader(thorChain.Repo(), bestBlk.Header().ID(), filter)
 	res, ok, err := br.Read()
 
 	// Assert

api/transactions/transactions_benchmark_test.go

@@ -368,11 +368,6 @@ func packTxsIntoBlock(thorChain *testchain.Chain, proposerAccount *genesis.DevAc
 }
 
 func createChain(db *muxdb.MuxDB, accounts []genesis.DevAccount) (*testchain.Chain, error) {
-	forkConfig := thor.NoFork
-	forkConfig.VIP191 = 1
-	forkConfig.BLOCKLIST = 0
-	forkConfig.VIP214 = 2
-
 	// Create the state manager (Stater) with the initialized database.
 	stater := state.NewStater(db)
 
@@ -399,7 +394,7 @@ func createChain(db *muxdb.MuxDB, accounts []genesis.DevAccount) (*testchain.Cha
 		LaunchTime: 1526400000,
 		GasLimit:   thor.InitialGasLimit,
 		ExtraData:  "",
-		ForkConfig: &forkConfig,
+		ForkConfig: &testchain.IntTestChainForkConfig,
 		Authority:  authAccs,
 		Accounts:   stateAccs,
 		Params: genesis.Params{

api/transactions/transactions_test.go

@@ -330,13 +330,10 @@ func httpPostAndCheckResponseStatus(t *testing.T, url string, obj interface{}, r
 }
 
 func initTransactionServer(t *testing.T) {
-	forkConfig := thor.NoFork
-	forkConfig.BLOCKLIST = 0
-	forkConfig.VIP191 = 1
-	forkConfig.VIP214 = 2
+	forkConfig := testchain.IntTestChainForkConfig
 	forkConfig.GALACTICA = 2
 
-	thorChain, err := testchain.NewIntegrationTestChainWithFork(forkConfig)
+	thorChain, err := testchain.NewIntegrationTestChain(forkConfig)
 	require.NoError(t, err)
 
 	chainTag = thorChain.Repo().ChainTag()

api/transfers/transfers_test.go

@@ -171,7 +171,7 @@ func insertBlocks(t *testing.T, db *logdb.LogDB, n int) {
 }
 
 func initTransferServer(t *testing.T, logDb *logdb.LogDB, limit uint64) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	router := mux.NewRouter()

api/utils/revisions_test.go

@@ -98,7 +98,7 @@ func TestAllowNext(t *testing.T) {
 }
 
 func TestGetSummary(t *testing.T) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	// Test cases
@@ -153,7 +153,7 @@ func TestGetSummary(t *testing.T) {
 }
 
 func TestGetSummaryAndState(t *testing.T) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	b := thorChain.GenesisBlock()

cmd/thor/node/node_benchmark_test.go

@@ -355,11 +355,6 @@ func packTxsIntoBlock(thorChain *testchain.Chain, proposerAccount *genesis.DevAc
 }
 
 func createChain(db *muxdb.MuxDB, accounts []genesis.DevAccount) (*testchain.Chain, error) {
-	forkConfig := thor.NoFork
-	forkConfig.VIP191 = 1
-	forkConfig.BLOCKLIST = 0
-	forkConfig.VIP214 = 2
-
 	// Create the state manager (Stater) with the initialized database.
 	stater := state.NewStater(db)
 
@@ -386,7 +381,7 @@ func createChain(db *muxdb.MuxDB, accounts []genesis.DevAccount) (*testchain.Cha
 		LaunchTime: 1526400000,
 		GasLimit:   thor.InitialGasLimit,
 		ExtraData:  "",
-		ForkConfig: &forkConfig,
+		ForkConfig: &testchain.IntTestChainForkConfig,
 		Authority:  authAccs,
 		Accounts:   stateAccs,
 		Params: genesis.Params{

consensus/consensus_test.go

@@ -22,6 +22,7 @@ import (
 	"github.com/vechain/thor/v2/muxdb"
 	"github.com/vechain/thor/v2/packer"
 	"github.com/vechain/thor/v2/state"
+	"github.com/vechain/thor/v2/test/testchain"
 	"github.com/vechain/thor/v2/thor"
 	"github.com/vechain/thor/v2/tx"
 	"github.com/vechain/thor/v2/vrf"
@@ -84,10 +85,7 @@ func newTestConsensus() (*testConsensus, error) {
 		return nil, err
 	}
 
-	forkConfig := thor.NoFork
-	forkConfig.VIP191 = 1
-	forkConfig.BLOCKLIST = 0
-	forkConfig.VIP214 = 2
+	forkConfig := testchain.IntTestChainForkConfig
 	forkConfig.GALACTICA = 5
 
 	proposer := genesis.DevAccounts()[0]

consensus/fork/galactica.go

@@ -84,15 +84,15 @@ func CalcBaseFee(config *thor.ForkConfig, parent *block.Header) *big.Int {
 		y := x.Div(x, parentGasTargetBig)
 		baseFeeDelta := x.Div(y, baseFeeChangeDenominator)
 
-		// Setting the minimun baseFee to InitialBaseFee
+		// Setting the minimum baseFee to InitialBaseFee
 		return math.BigMax(
 			x.Sub(parentBaseFee, baseFeeDelta),
 			big.NewInt(thor.InitialBaseFee),
 		)
 	}
 }
 
-func GalacticaTxGasPriceAdapater(tr *tx.Transaction, gasPrice *big.Int) *GalacticaFeeMarketItems {
+func GalacticaTxGasPriceAdapter(tr *tx.Transaction, gasPrice *big.Int) *GalacticaFeeMarketItems {
 	var maxPriorityFee, maxFee *big.Int
 	switch tr.Type() {
 	case tx.LegacyTxType:
@@ -122,8 +122,9 @@ func GalacticaGasPrice(tr *tx.Transaction, baseGasPrice *big.Int, galacticaItems
 		return gasPrice
 	}
 
-	feeItems := GalacticaTxGasPriceAdapater(tr, gasPrice)
+	feeItems := GalacticaTxGasPriceAdapter(tr, gasPrice)
 	// This gasPrice is the same that will be used when refunding the user
+	// it takes into account the priority fee that will be payed to the validator
 	return math.BigMin(new(big.Int).Add(feeItems.MaxPriorityFee, galacticaItems.BaseFee), feeItems.MaxFee)
 }
 
@@ -134,7 +135,7 @@ func GalacticaPriorityPrice(tr *tx.Transaction, baseGasPrice, provedWork *big.In
 		return priorityPrice
 	}
 
-	feeItems := GalacticaTxGasPriceAdapater(tr, priorityPrice)
+	feeItems := GalacticaTxGasPriceAdapter(tr, priorityPrice)
 	// This gasPrice will be used to compensate the validator
 	return math.BigMin(feeItems.MaxPriorityFee, new(big.Int).Sub(feeItems.MaxFee, galacticaItems.BaseFee))
 }

packer/flow_test.go

@@ -294,7 +294,7 @@ func TestAdoptErr(t *testing.T) {
 
 func TestAdoptErrorAfterGalactica(t *testing.T) {
 	forks := thor.ForkConfig{GALACTICA: 2}
-	chain, err := testchain.NewIntegrationTestChainWithFork(forks)
+	chain, err := testchain.NewIntegrationTestChain(forks)
 	assert.NoError(t, err)
 
 	// Try to adopt a dyn fee tx before galactica fork activates - FAILS
@@ -348,7 +348,7 @@ func TestAdoptErrorAfterGalactica(t *testing.T) {
 }
 
 func TestAdoptAfterGalacticaLowerBaseFeeThreshold(t *testing.T) {
-	chain, err := testchain.NewIntegrationTestChainWithFork(thor.ForkConfig{GALACTICA: 1})
+	chain, err := testchain.NewIntegrationTestChain(thor.ForkConfig{GALACTICA: 1})
 	assert.NoError(t, err)
 
 	tr := tx.NewTxBuilder(tx.LegacyTxType).ChainTag(chain.Repo().ChainTag()).Gas(21000).Expiration(100).MustBuild()

packer/packer_test.go

@@ -6,7 +6,6 @@
 package packer_test
 
 import (
-	"fmt"
 	"math"
 	"math/big"
 	"testing"
@@ -112,7 +111,9 @@ func TestP(t *testing.T) {
 	}
 
 	best := repo.BestBlockSummary()
-	fmt.Println(best.Header.Number(), best.Header.GasUsed())
+	assert.NotNil(t, best)
+	assert.True(t, best.Header.Number() > 0)
+	assert.True(t, best.Header.GasUsed() > 0)
 }
 
 func TestForkVIP191(t *testing.T) {

runtime/runtime.go

@@ -91,7 +91,7 @@ type Runtime struct {
 }
 
 var (
-	// ErrMaxFeePerGasTooLow is returned if the transaction fee cap is less than the
+	// ErrMaxFeePerGasTooLow is returned if the transaction fee cap is less than
 	// the base fee of the block.
 	ErrMaxFeePerGasTooLow = errors.New("max fee per gas is less than block base fee")
 )
@@ -426,7 +426,7 @@ func (rt *Runtime) PrepareTransaction(tx *tx.Transaction) (*TransactionExecutor,
 	}
 
 	if galactica {
-		feeItems := fork.GalacticaTxGasPriceAdapater(tx, gasPrice)
+		feeItems := fork.GalacticaTxGasPriceAdapter(tx, gasPrice)
 		if feeItems.MaxFee.Cmp(rt.ctx.BaseFee) < 0 {
 			return nil, ErrMaxFeePerGasTooLow
 		}

test/testchain/chain.go

@@ -60,18 +60,17 @@ func New(
 	}
 }
 
-// NewIntegrationTestChain is a convenience function that creates a Chain for testing.
-// It uses an in-memory database, development network genesis, and a solo BFT engine.
-func NewIntegrationTestChain() (*Chain, error) {
-	forkConfig := thor.NoFork
-	forkConfig.VIP191 = 1
-	forkConfig.BLOCKLIST = 0
-	forkConfig.VIP214 = 2
+var IntTestChainForkConfig = thor.NoFork
 
-	return NewIntegrationTestChainWithFork(forkConfig)
+func init() {
+	IntTestChainForkConfig.BLOCKLIST = 0
+	IntTestChainForkConfig.VIP191 = 1
+	IntTestChainForkConfig.VIP214 = 2
 }
 
-func NewIntegrationTestChainWithFork(forkConfig thor.ForkConfig) (*Chain, error) {
+// NewIntegrationTestChain is a convenience function that creates a Chain for testing.
+// It uses an in-memory database, development network genesis, and a solo BFT engine.
+func NewIntegrationTestChain(forkConfig thor.ForkConfig) (*Chain, error) {
 	// Initialize the database
 	db := muxdb.NewMem()
 

thorclient/api_test.go

@@ -48,7 +48,7 @@ var (
 )
 
 func initAPIServer(t *testing.T) (*testchain.Chain, *httptest.Server) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	// mint some transactions to be used in the endpoints