forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 10:50:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

increase XDC test gap to 450

Browse source
This commit is contained in:
Jianrong 2021-08-29 22:34:58 +10:00
parent 944de1130a
commit 81b6ffabba
2 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
params/config.go
View file

@ -157,7 +157,7 @@ var (
// This configuration is intentionally not using keyed fields to force anyone // This configuration is intentionally not using keyed fields to force anyone
// adding flags to the config to also have to set these fields. // adding flags to the config to also have to set these fields.
AllXDPoSProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, nil, nil, nil, &XDPoSConfig{Period: 0, Epoch: 30000}} AllXDPoSProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, nil, nil, nil, &XDPoSConfig{Period: 0, Epoch: 30000}}
TestXDPoSMockChainConfig = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, new(EthashConfig), nil, &XDPoSConfig{Epoch: 900, Gap: 890, SkipValidation: true}} TestXDPoSMockChainConfig = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, new(EthashConfig), nil, &XDPoSConfig{Epoch: 900, Gap: 450, SkipValidation: true}}
AllCliqueProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, &CliqueConfig{Period: 0, Epoch: 30000}, nil} AllCliqueProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, &CliqueConfig{Period: 0, Epoch: 30000}, nil}
TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, new(EthashConfig), nil, nil} TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, new(EthashConfig), nil, nil}

44
tests/end_to_end/block_signer_test.go → tests/block_signer_test.go
View file

@ -1,4 +1,4 @@
package end_to_end package tests
import ( import (
"bytes" "bytes"
@ -27,6 +27,8 @@ import (
type masterNodes map[string]big.Int type masterNodes map[string]big.Int
type signersList map[string]bool type signersList map[string]bool
const GAP = int(450)
var ( var (
acc1Key, _ = crypto.HexToECDSA("8a1f9a8f95be41cd7ccb6168179afb4504aefe388d1e14474d32c45c72ce7b7a") acc1Key, _ = crypto.HexToECDSA("8a1f9a8f95be41cd7ccb6168179afb4504aefe388d1e14474d32c45c72ce7b7a")
acc2Key, _ = crypto.HexToECDSA("49a7b37aa6f6645917e7b807e9d1c00d4fa71f18343b0d4122a4d2df64dd6fee") acc2Key, _ = crypto.HexToECDSA("49a7b37aa6f6645917e7b807e9d1c00d4fa71f18343b0d4122a4d2df64dd6fee")
@ -245,7 +247,7 @@ func PrepareXDCTestBlockChain(t *testing.T) (*BlockChain, *backends.SimulatedBac
currentBlock := blockchain.Genesis() currentBlock := blockchain.Genesis()
// Insert initial 9 blocks // Insert initial 9 blocks
for i := 1; i <= 9; i++ { for i := 1; i < GAP; i++ {
blockCoinBase := fmt.Sprintf("0x111000000000000000000000000000000%03d", i) blockCoinBase := fmt.Sprintf("0x111000000000000000000000000000000%03d", i)
merkleRoot := "35999dded35e8db12de7e6c1471eb9670c162eec616ecebbaf4fddd4676fb930" merkleRoot := "35999dded35e8db12de7e6c1471eb9670c162eec616ecebbaf4fddd4676fb930"
block, err := insertBlock(blockchain, i, blockCoinBase, currentBlock, merkleRoot) block, err := insertBlock(blockchain, i, blockCoinBase, currentBlock, merkleRoot)
@ -267,9 +269,9 @@ func PrepareXDCTestBlockChain(t *testing.T) (*BlockChain, *backends.SimulatedBac
func TestCallUpdateM1WithSmartContractTranscation(t *testing.T) { func TestCallUpdateM1WithSmartContractTranscation(t *testing.T) {
blockchain, backend, currentBlock := PrepareXDCTestBlockChain(t) blockchain, backend, currentBlock := PrepareXDCTestBlockChain(t)
// Insert first Block 10 A // Insert first Block 450 A
t.Logf("Inserting block with propose at 10 A...") t.Logf("Inserting block with propose at 450 A...")
blockCoinbaseA := "0xaaa0000000000000000000000000000000000010" blockCoinbaseA := "0xaaa0000000000000000000000000000000000450"
tx, err := voteTX(37117, 0, acc1Addr.String()) tx, err := voteTX(37117, 0, acc1Addr.String())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -277,7 +279,7 @@ func TestCallUpdateM1WithSmartContractTranscation(t *testing.T) {
//Get from block validator error message //Get from block validator error message
merkleRoot := "46234e9cd7e85a267f7f0435b15256a794a2f6d65cc98cdbd21dcd10a01d9772" merkleRoot := "46234e9cd7e85a267f7f0435b15256a794a2f6d65cc98cdbd21dcd10a01d9772"
blockA, err := insertBlockTxs(blockchain, 10, blockCoinbaseA, currentBlock, []*types.Transaction{tx}, merkleRoot) blockA, err := insertBlockTxs(blockchain, 450, blockCoinbaseA, currentBlock, []*types.Transaction{tx}, merkleRoot)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -313,16 +315,16 @@ func TestCallUpdateM1WhenForkedBlockBackToMainChain(t *testing.T) {
t.Fatalf("voterAddr should sit in the signer list") t.Fatalf("voterAddr should sit in the signer list")
} }
// Insert first Block 10 A // Insert first Block 450 A
t.Logf("Inserting block with propose at 10 A...") t.Logf("Inserting block with propose at 450 A...")
blockCoinbaseA := "0xaaa0000000000000000000000000000000000010" blockCoinbaseA := "0xaaa0000000000000000000000000000000000450"
tx, err := voteTX(37117, 0, acc1Addr.String()) tx, err := voteTX(37117, 0, acc1Addr.String())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
merkleRoot := "46234e9cd7e85a267f7f0435b15256a794a2f6d65cc98cdbd21dcd10a01d9772" merkleRoot := "46234e9cd7e85a267f7f0435b15256a794a2f6d65cc98cdbd21dcd10a01d9772"
blockA, err := insertBlockTxs(blockchain, 10, blockCoinbaseA, currentBlock, []*types.Transaction{tx}, merkleRoot) blockA, err := insertBlockTxs(blockchain, 450, blockCoinbaseA, currentBlock, []*types.Transaction{tx}, merkleRoot)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -337,20 +339,20 @@ func TestCallUpdateM1WhenForkedBlockBackToMainChain(t *testing.T) {
} }
// Insert forked Block 10 B // Insert forked Block 10 B
t.Logf("Inserting block with propose at 10 B...") t.Logf("Inserting block with propose at 450 B...")
blockCoinBase10B := "0xbbb0000000000000000000000000000000000010" blockCoinBase450B := "0xbbb0000000000000000000000000000000000450"
tx, err = voteTX(37117, 0, acc2Addr.String()) tx, err = voteTX(37117, 0, acc2Addr.String())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
merkleRoot = "068dfa09d7b4093441c0cc4d9807a71bc586f6101c072d939b214c21cd136eb3" merkleRoot = "068dfa09d7b4093441c0cc4d9807a71bc586f6101c072d939b214c21cd136eb3"
block10B, err := insertBlockTxs(blockchain, 10, blockCoinBase10B, currentBlock, []*types.Transaction{tx}, merkleRoot) block450B, err := insertBlockTxs(blockchain, 450, blockCoinBase450B, currentBlock, []*types.Transaction{tx}, merkleRoot)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
signers, err = GetSnapshotSigner(blockchain, block10B.Header()) signers, err = GetSnapshotSigner(blockchain, block450B.Header())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -360,18 +362,18 @@ func TestCallUpdateM1WhenForkedBlockBackToMainChain(t *testing.T) {
t.Fatalf("account 3 should sit in the signer list as previos block result") t.Fatalf("account 3 should sit in the signer list as previos block result")
} }
//Insert block 11 parent is 11 B //Insert block 451 parent is 451 B
t.Logf("Inserting block with propose at 11 B...") t.Logf("Inserting block with propose at 451 B...")
blockCoinBase11B := "0xbbb0000000000000000000000000000000000011" blockCoinBase451B := "0xbbb0000000000000000000000000000000000451"
merkleRoot = "068dfa09d7b4093441c0cc4d9807a71bc586f6101c072d939b214c21cd136eb3" merkleRoot = "068dfa09d7b4093441c0cc4d9807a71bc586f6101c072d939b214c21cd136eb3"
block11B, err := insertBlock(blockchain, 11, blockCoinBase11B, block10B, merkleRoot) block451B, err := insertBlock(blockchain, 451, blockCoinBase451B, block450B, merkleRoot)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
signers, err = GetSnapshotSigner(blockchain, block10B.Header()) signers, err = GetSnapshotSigner(blockchain, block450B.Header())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -380,7 +382,7 @@ func TestCallUpdateM1WhenForkedBlockBackToMainChain(t *testing.T) {
t.Fatalf("account 2 should sit in the signer list") t.Fatalf("account 2 should sit in the signer list")
} }
signers, err = GetSnapshotSigner(blockchain, block11B.Header()) signers, err = GetSnapshotSigner(blockchain, block451B.Header())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -454,7 +456,7 @@ func createXDPoSTestBlock(bc *BlockChain, parentHash, coinbase string, number in
Difficulty: big.NewInt(int64(1)), Difficulty: big.NewInt(int64(1)),
Number: big.NewInt(int64(number)), Number: big.NewInt(int64(number)),
GasLimit: 1200000000, GasLimit: 1200000000,
Time: big.NewInt(int64(number * 10)), Time: uint64(number * 10),
Extra: extraByte, Extra: extraByte,
} }