Make requested PR changes #2

0xPolygon · Aug 1, 2021 · 96a5af8 · 96a5af8
1 parent 8e3b0a1
commit 96a5af8
Show file tree

Hide file tree

Showing 13 changed files with 112 additions and 75 deletions.
diff --git a/consensus/dev/dev.go b/consensus/dev/dev.go
@@ -151,6 +151,9 @@ func (d *Dev) writeNewBlock(parent *types.Header) error {
 
 	// Commit the changes
 	_, root := transition.Commit()
+	// Since the block transactions are firstly written, then the block is built (causing the txns to be written again),
+	// no need to double add staking / unstaking events that might have been added in the initial txn write,
+	// and have complicated logic in unstaking
 	staking.GetStakingHub().ClearEvents()
 
 	// Update the header

diff --git a/e2e/broadcast_test.go b/e2e/broadcast_test.go
@@ -9,13 +9,13 @@ import (
 
 	"github.com/0xPolygon/minimal/crypto"
 	"github.com/0xPolygon/minimal/e2e/framework"
-	"github.com/0xPolygon/minimal/helper/currency"
+	"github.com/0xPolygon/minimal/helper/tests"
 	"github.com/0xPolygon/minimal/types"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestBroadcast(t *testing.T) {
-	tests := []struct {
+	testTable := []struct {
 		name     string
 		numNodes int
 		// Number of nodes that connects to left node
@@ -39,11 +39,11 @@ func TestBroadcast(t *testing.T) {
 
 	conf := func(config *framework.TestServerConfig) {
 		config.SetConsensus(framework.ConsensusDummy)
-		config.Premine(senderAddr, currency.EthToWei(10))
+		config.Premine(senderAddr, tests.EthToWei(10))
 		config.SetSeal(true)
 	}
 
-	for _, tt := range tests {
+	for _, tt := range testTable {
 		t.Run(tt.name, func(t *testing.T) {
 			srvs := framework.NewTestServers(t, tt.numNodes, conf)
 			framework.MultiJoinSerial(t, srvs[0:tt.numConnectedNodes])
@@ -71,7 +71,7 @@ func TestBroadcast(t *testing.T) {
 				Nonce:    0,
 				From:     senderAddr,
 				To:       &receiverAddr,
-				Value:    currency.EthToWei(1),
+				Value:    tests.EthToWei(1),
 				Gas:      1000000,
 				GasPrice: big.NewInt(10000),
 				Input:    []byte{},

diff --git a/e2e/encoding_test.go b/e2e/encoding_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/0xPolygon/minimal/e2e/framework"
-	"github.com/0xPolygon/minimal/helper/currency"
+	"github.com/0xPolygon/minimal/helper/tests"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -16,7 +16,7 @@ func TestEncoding(t *testing.T) {
 	srvs := framework.NewTestServers(t, 1, func(config *framework.TestServerConfig) {
 		config.SetConsensus(framework.ConsensusDev)
 		config.SetSeal(true)
-		config.Premine(from, currency.EthToWei(10))
+		config.Premine(from, tests.EthToWei(10))
 	})
 	srv := srvs[0]
 

diff --git a/e2e/ibft_test.go b/e2e/ibft_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/0xPolygon/minimal/consensus/ibft"
-	"github.com/0xPolygon/minimal/helper/currency"
+	"github.com/0xPolygon/minimal/helper/tests"
 	"github.com/umbracle/go-web3"
 
 	"github.com/0xPolygon/minimal/e2e/framework"
@@ -20,8 +20,8 @@ func TestIbft_Transfer(t *testing.T) {
 	_, receiverAddr := framework.GenerateKeyAndAddr(t)
 
 	ibftManager := framework.NewIBFTServersManager(t, IBFTMinNodes, IBFTDirPrefix, func(i int, config *framework.TestServerConfig) {
-		config.Premine(senderAddr, currency.EthToWei(10))
-		config.PremineValidatorBalance(big.NewInt(0), currency.EthToWei(10))
+		config.Premine(senderAddr, tests.EthToWei(10))
+		config.PremineValidatorBalance(big.NewInt(0), tests.EthToWei(10))
 		config.SetSeal(true)
 	})
 
@@ -36,7 +36,7 @@ func TestIbft_Transfer(t *testing.T) {
 			To:       &receiverAddr,
 			GasPrice: big.NewInt(10000),
 			Gas:      1000000,
-			Value:    currency.EthToWei(1),
+			Value:    tests.EthToWei(1),
 		}
 
 		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
@@ -58,7 +58,7 @@ func TestIbft_TransactionFeeRecipient(t *testing.T) {
 		{
 			name:         "transfer transaction",
 			contractCall: false,
-			txAmount:     currency.EthToWei(1),
+			txAmount:     tests.EthToWei(1),
 		},
 		{
 			name:         "contract function execution",
@@ -73,8 +73,8 @@ func TestIbft_TransactionFeeRecipient(t *testing.T) {
 			_, receiverAddr := framework.GenerateKeyAndAddr(t)
 
 			ibftManager := framework.NewIBFTServersManager(t, IBFTMinNodes, IBFTDirPrefix, func(i int, config *framework.TestServerConfig) {
-				config.Premine(senderAddr, currency.EthToWei(10))
-				config.PremineValidatorBalance(big.NewInt(0), currency.EthToWei(10))
+				config.Premine(senderAddr, tests.EthToWei(10))
+				config.PremineValidatorBalance(big.NewInt(0), tests.EthToWei(10))
 				config.SetSeal(true)
 			})
 

diff --git a/e2e/logs_test.go b/e2e/logs_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/0xPolygon/minimal/e2e/framework"
-	"github.com/0xPolygon/minimal/helper/currency"
+	"github.com/0xPolygon/minimal/helper/tests"
 	"github.com/stretchr/testify/assert"
 	"github.com/umbracle/go-web3"
 )
@@ -16,7 +16,7 @@ func TestNewFilter_Logs(t *testing.T) {
 	_, addr := framework.GenerateKeyAndAddr(t)
 	srvs := framework.NewTestServers(t, 1, func(config *framework.TestServerConfig) {
 		config.SetConsensus(framework.ConsensusDev)
-		config.Premine(addr, currency.EthToWei(10))
+		config.Premine(addr, tests.EthToWei(10))
 		config.SetSeal(true)
 	})
 	srv := srvs[0]
@@ -51,7 +51,7 @@ func TestNewFilter_Block(t *testing.T) {
 
 	srvs := framework.NewTestServers(t, 1, func(config *framework.TestServerConfig) {
 		config.SetConsensus(framework.ConsensusDev)
-		config.Premine(from, currency.EthToWei(10))
+		config.Premine(from, tests.EthToWei(10))
 		config.SetSeal(true)
 	})
 	srv := srvs[0]

diff --git a/e2e/pos_test.go b/e2e/pos_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/0xPolygon/minimal/consensus/ibft/proto"
 	"github.com/0xPolygon/minimal/crypto"
 	"github.com/0xPolygon/minimal/e2e/framework"
-	"github.com/0xPolygon/minimal/helper/currency"
+	"github.com/0xPolygon/minimal/helper/tests"
 	"github.com/0xPolygon/minimal/state/runtime/system"
 	"github.com/0xPolygon/minimal/types"
 	"github.com/stretchr/testify/assert"
@@ -47,8 +47,8 @@ func TestPoS_Stake(t *testing.T) {
 
 	numGenesisValidators := IBFTMinNodes
 	ibftManager := framework.NewIBFTServersManager(t, numGenesisValidators, IBFTDirPrefix, func(i int, config *framework.TestServerConfig) {
-		config.PremineWithStake(stakerAddr, currency.EthToWei(10), currency.EthToWei(10))
-		config.PremineValidatorBalance(big.NewInt(0), currency.EthToWei(10))
+		config.PremineWithStake(stakerAddr, tests.EthToWei(10), tests.EthToWei(10))
+		config.PremineValidatorBalance(big.NewInt(0), tests.EthToWei(10))
 		config.SetSeal(true)
 	})
 
@@ -64,7 +64,7 @@ func TestPoS_Stake(t *testing.T) {
 		To:       &stakingContractAddr,
 		GasPrice: big.NewInt(10000),
 		Gas:      1000000,
-		Value:    currency.EthToWei(1),
+		Value:    tests.EthToWei(1),
 	}
 	ctx, cancel = context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
@@ -90,7 +90,7 @@ func TestPoS_Unstake(t *testing.T) {
 	numGenesisValidators := IBFTMinNodes + 1
 	ibftManager := framework.NewIBFTServersManager(t, numGenesisValidators, IBFTDirPrefix, func(i int, config *framework.TestServerConfig) {
 		// Premine to send unstake transaction
-		config.PremineValidatorBalance(currency.EthToWei(1), currency.EthToWei(10))
+		config.PremineValidatorBalance(tests.EthToWei(1), tests.EthToWei(10))
 		config.SetSeal(true)
 	})
 
@@ -121,7 +121,7 @@ func TestPoS_Unstake(t *testing.T) {
 		To:       &unstakingContractAddr,
 		GasPrice: big.NewInt(10000),
 		Gas:      1000000,
-		Value:    currency.EthToWei(0),
+		Value:    tests.EthToWei(0),
 	}
 	ctx, cancel = context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
@@ -146,7 +146,7 @@ func TestPoS_UnstakeAttack(t *testing.T) {
 	numGenesisValidators := IBFTMinNodes + 1
 	gasPrice := big.NewInt(10000)
 	receiptArr := make([]*web3.Receipt, numGenesisValidators)
-	defaultBalance := currency.EthToWei(10)
+	defaultBalance := tests.EthToWei(10)
 
 	// Set up the manager
 	ibftManager := framework.NewIBFTServersManager(t, numGenesisValidators, IBFTDirPrefix, func(i int, config *framework.TestServerConfig) {
@@ -178,7 +178,7 @@ func TestPoS_UnstakeAttack(t *testing.T) {
 			To:       &unstakingContractAddr,
 			GasPrice: gasPrice,
 			Gas:      1000000,
-			Value:    currency.EthToWei(0),
+			Value:    tests.EthToWei(0),
 		}
 
 		ctx, cancel = context.WithTimeout(context.Background(), 10*time.Second)
@@ -222,8 +222,9 @@ func TestPoS_UnstakeAttack(t *testing.T) {
 		fee,
 	)
 
-	actualStakedBalance := getStakedBalance(referenceAddr, srv.JSONRPC(), t)
-	actualBalance := getAccountBalance(referenceAddr, srv.JSONRPC(), t)
+	client := srv.JSONRPC()
+	actualStakedBalance := getStakedBalance(referenceAddr, client, t)
+	actualBalance := getAccountBalance(referenceAddr, client, t)
 
 	// Make sure the account balance matches up
 	assert.Equalf(t,

diff --git a/e2e/system_test.go b/e2e/system_test.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/0xPolygon/minimal/e2e/framework"
-	"github.com/0xPolygon/minimal/helper/currency"
+	"github.com/0xPolygon/minimal/helper/tests"
 	"github.com/0xPolygon/minimal/state/runtime/system"
 	"github.com/0xPolygon/minimal/types"
 	"github.com/stretchr/testify/assert"
@@ -85,7 +85,7 @@ func TestSystem_StakeAmount(t *testing.T) {
 		// Valid account #1
 		{
 			addressKeyPairs[0].address,
-			currency.EthToWei(50), // 50 ETH
+			tests.EthToWei(50), // 50 ETH
 		},
 		// Empty account
 		{
@@ -105,13 +105,13 @@ func TestSystem_StakeAmount(t *testing.T) {
 		{
 			"Valid stake",
 			validAccounts[0].address,
-			currency.EthToWei(10),
+			tests.EthToWei(10),
 			true,
 		},
 		{
 			"Invalid stake",
 			validAccounts[1].address,
-			currency.EthToWei(100),
+			tests.EthToWei(100),
 			false,
 		},
 	}
@@ -210,20 +210,20 @@ func TestSystem_UnstakeAmount(t *testing.T) {
 		// Staking address initialization
 		{
 			stakingAddress,
-			currency.EthToWei(10), // 10 ETH has been staked in the past
-			currency.EthToWei(0),
+			tests.EthToWei(10), // 10 ETH has been staked in the past
+			tests.EthToWei(0),
 		},
 		// Valid account with stake
 		{
 			addressKeyPairs[0].address,
-			currency.EthToWei(50), // 50 ETH
-			currency.EthToWei(10), // 10 ETH
+			tests.EthToWei(50), // 50 ETH
+			tests.EthToWei(10), // 10 ETH
 		},
 		// Valid account without stake
 		{
 			addressKeyPairs[1].address,
-			currency.EthToWei(0),
-			currency.EthToWei(0),
+			tests.EthToWei(0),
+			tests.EthToWei(0),
 		},
 	}
 
@@ -236,13 +236,13 @@ func TestSystem_UnstakeAmount(t *testing.T) {
 		{
 			"Valid unstake",
 			validAccounts[1].address,
-			currency.EthToWei(10),
+			tests.EthToWei(10),
 			true,
 		},
 		{
 			"Invalid unstake",
 			validAccounts[2].address,
-			currency.EthToWei(100),
+			tests.EthToWei(100),
 			false,
 		},
 	}

diff --git a/e2e/transaction_test.go b/e2e/transaction_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/0xPolygon/minimal/e2e/framework"
-	"github.com/0xPolygon/minimal/helper/currency"
+	"github.com/0xPolygon/minimal/helper/tests"
 	"github.com/0xPolygon/minimal/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/umbracle/go-web3"
@@ -17,10 +17,10 @@ func TestSignedTransaction(t *testing.T) {
 	senderKey, senderAddr := framework.GenerateKeyAndAddr(t)
 	_, receiverAddr := framework.GenerateKeyAndAddr(t)
 
-	preminedAmount := currency.EthToWei(10)
+	preminedAmount := tests.EthToWei(10)
 	ibftManager := framework.NewIBFTServersManager(t, IBFTMinNodes, IBFTDirPrefix, func(i int, config *framework.TestServerConfig) {
 		config.Premine(senderAddr, preminedAmount)
-		config.PremineValidatorBalance(big.NewInt(0), currency.EthToWei(10))
+		config.PremineValidatorBalance(big.NewInt(0), tests.EthToWei(10))
 		config.SetSeal(true)
 	})
 
@@ -111,7 +111,7 @@ func TestEthTransfer(t *testing.T) {
 		// Valid account #1
 		{
 			types.StringToAddress("1"),
-			currency.EthToWei(50), // 50 ETH
+			tests.EthToWei(50), // 50 ETH
 		},
 		// Empty account
 		{
@@ -121,7 +121,7 @@ func TestEthTransfer(t *testing.T) {
 		// Valid account #2
 		{
 			types.StringToAddress("3"),
-			currency.EthToWei(10), // 10 ETH
+			tests.EthToWei(10), // 10 ETH
 		},
 	}
 
@@ -137,23 +137,23 @@ func TestEthTransfer(t *testing.T) {
 			"Valid ETH transfer #1",
 			validAccounts[0].address,
 			validAccounts[2].address,
-			currency.EthToWei(10),
+			tests.EthToWei(10),
 			true,
 		},
 		{
 			// ACC #2 -> ACC #3
 			"Invalid ETH transfer",
 			validAccounts[1].address,
 			validAccounts[2].address,
-			currency.EthToWei(100),
+			tests.EthToWei(100),
 			false,
 		},
 		{
 			// ACC #3 -> ACC #2
 			"Valid ETH transfer #2",
 			validAccounts[2].address,
 			validAccounts[1].address,
-			currency.EthToWei(5),
+			tests.EthToWei(5),
 			true,
 		},
 	}

diff --git a/helper/currency/currency.go → helper/tests/testing.go b/helper/currency/currency.go → helper/tests/testing.go
@@ -1,4 +1,4 @@
-package currency
+package tests
 
 import "math/big"