forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

correcting blockchain_test

Browse source
This commit is contained in:
Gealber 2024-06-09 15:54:51 +02:00
parent fe82808dd2
commit 03917a251d
1 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
core/blockchain_test.go
View file

@ -2182,10 +2182,10 @@ func testInsertKnownChainData(t *testing.T, typ string, scheme string) {
genDb, blocks, receipts := GenerateChainWithGenesis(genesis, engine, 32, func(i int, b *BlockGen) { b.SetCoinbase(common.Address{1}) }) genDb, blocks, receipts := GenerateChainWithGenesis(genesis, engine, 32, func(i int, b *BlockGen) { b.SetCoinbase(common.Address{1}) })
// A longer chain but total difficulty is lower. // A longer chain but total difficulty is lower.
blocks2, _ := GenerateChain(genesis.Config, blocks[len(blocks)-1], engine, genDb, 65, func(i int, b *BlockGen) { b.SetCoinbase(common.Address{1}) }) blocks2, receipts2 := GenerateChain(genesis.Config, blocks[len(blocks)-1], engine, genDb, 65, func(i int, b *BlockGen) { b.SetCoinbase(common.Address{1}) })
// A shorter chain but total difficulty is higher. // A shorter chain but total difficulty is higher.
blocks3, _ := GenerateChain(genesis.Config, blocks[len(blocks)-1], engine, genDb, 64, func(i int, b *BlockGen) { blocks3, receipts3 := GenerateChain(genesis.Config, blocks[len(blocks)-1], engine, genDb, 64, func(i int, b *BlockGen) {
b.SetCoinbase(common.Address{1}) b.SetCoinbase(common.Address{1})
b.OffsetTime(-9) // A higher difficulty b.OffsetTime(-9) // A higher difficulty
}) })
@ -2203,11 +2203,11 @@ func testInsertKnownChainData(t *testing.T, typ string, scheme string) {
defer chain.Stop() defer chain.Stop()
var ( var (
inserter func(blocks []*types.Block) error inserter func(blocks []*types.Block, receipts []types.Receipts) error
asserter func(t *testing.T, block *types.Block) asserter func(t *testing.T, block *types.Block)
) )
if typ == "headers" { if typ == "headers" {
inserter = func(blocks []*types.Block) error { inserter = func(blocks []*types.Block, receipts []types.Receipts) error {
headers := make([]*types.Header, 0, len(blocks)) headers := make([]*types.Header, 0, len(blocks))
for _, block := range blocks { for _, block := range blocks {
headers = append(headers, block.Header()) headers = append(headers, block.Header())
@ -2221,7 +2221,7 @@ func testInsertKnownChainData(t *testing.T, typ string, scheme string) {
} }
} }
} else if typ == "receipts" { } else if typ == "receipts" {
inserter = func(blocks []*types.Block) error { inserter = func(blocks []*types.Block, receipts []types.Receipts) error {
headers := make([]*types.Header, 0, len(blocks)) headers := make([]*types.Header, 0, len(blocks))
for _, block := range blocks { for _, block := range blocks {
headers = append(headers, block.Header()) headers = append(headers, block.Header())
@ -2239,7 +2239,7 @@ func testInsertKnownChainData(t *testing.T, typ string, scheme string) {
} }
} }
} else { } else {
inserter = func(blocks []*types.Block) error { inserter = func(blocks []*types.Block, receipts []types.Receipts) error {
_, err := chain.InsertChain(blocks) _, err := chain.InsertChain(blocks)
return err return err
} }
@ -2250,13 +2250,13 @@ func testInsertKnownChainData(t *testing.T, typ string, scheme string) {
} }
} }
if err := inserter(blocks); err != nil { if err := inserter(blocks, receipts); err != nil {
t.Fatalf("failed to insert chain data: %v", err) t.Fatalf("failed to insert chain data: %v", err)
} }
// Reimport the chain data again. All the imported // Reimport the chain data again. All the imported
// chain data are regarded "known" data. // chain data are regarded "known" data.
if err := inserter(blocks); err != nil { if err := inserter(blocks, receipts); err != nil {
t.Fatalf("failed to insert chain data: %v", err) t.Fatalf("failed to insert chain data: %v", err)
} }
asserter(t, blocks[len(blocks)-1]) asserter(t, blocks[len(blocks)-1])
@ -2265,19 +2265,19 @@ func testInsertKnownChainData(t *testing.T, typ string, scheme string) {
rollback := blocks[len(blocks)/2].NumberU64() rollback := blocks[len(blocks)/2].NumberU64()
chain.SetHead(rollback - 1) chain.SetHead(rollback - 1)
if err := inserter(append(blocks, blocks2...)); err != nil { if err := inserter(append(blocks, blocks2...), append(receipts, receipts2...)); err != nil {
t.Fatalf("failed to insert chain data: %v", err) t.Fatalf("failed to insert chain data: %v", err)
} }
asserter(t, blocks2[len(blocks2)-1]) asserter(t, blocks2[len(blocks2)-1])
// Import a heavier shorter but higher total difficulty chain with some known data as prefix. // Import a heavier shorter but higher total difficulty chain with some known data as prefix.
if err := inserter(append(blocks, blocks3...)); err != nil { if err := inserter(append(blocks, blocks3...), append(receipts, receipts3...)); err != nil {
t.Fatalf("failed to insert chain data: %v", err) t.Fatalf("failed to insert chain data: %v", err)
} }
asserter(t, blocks3[len(blocks3)-1]) asserter(t, blocks3[len(blocks3)-1])
// Import a longer but lower total difficulty chain with some known data as prefix. // Import a longer but lower total difficulty chain with some known data as prefix.
if err := inserter(append(blocks, blocks2...)); err != nil { if err := inserter(append(blocks, blocks2...), append(receipts, receipts2...)); err != nil {
t.Fatalf("failed to insert chain data: %v", err) t.Fatalf("failed to insert chain data: %v", err)
} }
// The head shouldn't change. // The head shouldn't change.
@ -2285,7 +2285,7 @@ func testInsertKnownChainData(t *testing.T, typ string, scheme string) {
// Rollback the heavier chain and re-insert the longer chain again // Rollback the heavier chain and re-insert the longer chain again
chain.SetHead(rollback - 1) chain.SetHead(rollback - 1)
if err := inserter(append(blocks, blocks2...)); err != nil { if err := inserter(append(blocks, blocks2...), append(receipts, receipts2...)); err != nil {
t.Fatalf("failed to insert chain data: %v", err) t.Fatalf("failed to insert chain data: %v", err)
} }
asserter(t, blocks2[len(blocks2)-1]) asserter(t, blocks2[len(blocks2)-1])
@ -2347,13 +2347,13 @@ func testInsertKnownChainDataWithMerging(t *testing.T, typ string, mergeHeight i
mergeBlock = uint64(len(blocks)) mergeBlock = uint64(len(blocks))
} }
// Longer chain and shorter chain // Longer chain and shorter chain
blocks2, _ := GenerateChain(genesis.Config, blocks[len(blocks)-1], engine, genDb, 65, func(i int, b *BlockGen) { blocks2, receipts2 := GenerateChain(genesis.Config, blocks[len(blocks)-1], engine, genDb, 65, func(i int, b *BlockGen) {
b.SetCoinbase(common.Address{1}) b.SetCoinbase(common.Address{1})
if b.header.Number.Uint64() >= mergeBlock { if b.header.Number.Uint64() >= mergeBlock {
b.SetPoS() b.SetPoS()
} }
}) })
blocks3, _ := GenerateChain(genesis.Config, blocks[len(blocks)-1], engine, genDb, 64, func(i int, b *BlockGen) { blocks3, receipts3 := GenerateChain(genesis.Config, blocks[len(blocks)-1], engine, genDb, 64, func(i int, b *BlockGen) {
b.SetCoinbase(common.Address{1}) b.SetCoinbase(common.Address{1})
b.OffsetTime(-9) // Time shifted, difficulty shouldn't be changed b.OffsetTime(-9) // Time shifted, difficulty shouldn't be changed
if b.header.Number.Uint64() >= mergeBlock { if b.header.Number.Uint64() >= mergeBlock {
@ -2374,11 +2374,11 @@ func testInsertKnownChainDataWithMerging(t *testing.T, typ string, mergeHeight i
defer chain.Stop() defer chain.Stop()
var ( var (
inserter func(blocks []*types.Block) error inserter func(blocks []*types.Block, receipts []types.Receipts) error
asserter func(t *testing.T, block *types.Block) asserter func(t *testing.T, block *types.Block)
) )
if typ == "headers" { if typ == "headers" {
inserter = func(blocks []*types.Block) error { inserter = func(blocks []*types.Block, receipts []types.Receipts) error {
headers := make([]*types.Header, 0, len(blocks)) headers := make([]*types.Header, 0, len(blocks))
for _, block := range blocks { for _, block := range blocks {
headers = append(headers, block.Header()) headers = append(headers, block.Header())
@ -2395,7 +2395,7 @@ func testInsertKnownChainDataWithMerging(t *testing.T, typ string, mergeHeight i
} }
} }
} else if typ == "receipts" { } else if typ == "receipts" {
inserter = func(blocks []*types.Block) error { inserter = func(blocks []*types.Block, receipts []types.Receipts) error {
headers := make([]*types.Header, 0, len(blocks)) headers := make([]*types.Header, 0, len(blocks))
for _, block := range blocks { for _, block := range blocks {
headers = append(headers, block.Header()) headers = append(headers, block.Header())
@ -2413,7 +2413,7 @@ func testInsertKnownChainDataWithMerging(t *testing.T, typ string, mergeHeight i
} }
} }
} else { } else {
inserter = func(blocks []*types.Block) error { inserter = func(blocks []*types.Block, receipts []types.Receipts) error {
i, err := chain.InsertChain(blocks) i, err := chain.InsertChain(blocks)
if err != nil { if err != nil {
return fmt.Errorf("index %d: %w", i, err) return fmt.Errorf("index %d: %w", i, err)
@ -2426,13 +2426,13 @@ func testInsertKnownChainDataWithMerging(t *testing.T, typ string, mergeHeight i
} }
} }
} }
if err := inserter(blocks); err != nil { if err := inserter(blocks, receipts); err != nil {
t.Fatalf("failed to insert chain data: %v", err) t.Fatalf("failed to insert chain data: %v", err)
} }
// Reimport the chain data again. All the imported // Reimport the chain data again. All the imported
// chain data are regarded "known" data. // chain data are regarded "known" data.
if err := inserter(blocks); err != nil { if err := inserter(blocks, receipts); err != nil {
t.Fatalf("failed to insert chain data: %v", err) t.Fatalf("failed to insert chain data: %v", err)
} }
asserter(t, blocks[len(blocks)-1]) asserter(t, blocks[len(blocks)-1])
@ -2440,13 +2440,13 @@ func testInsertKnownChainDataWithMerging(t *testing.T, typ string, mergeHeight i
// Import a long canonical chain with some known data as prefix. // Import a long canonical chain with some known data as prefix.
rollback := blocks[len(blocks)/2].NumberU64() rollback := blocks[len(blocks)/2].NumberU64()
chain.SetHead(rollback - 1) chain.SetHead(rollback - 1)
if err := inserter(blocks); err != nil { if err := inserter(blocks, receipts); err != nil {
t.Fatalf("failed to insert chain data: %v", err) t.Fatalf("failed to insert chain data: %v", err)
} }
asserter(t, blocks[len(blocks)-1]) asserter(t, blocks[len(blocks)-1])
// Import a longer chain with some known data as prefix. // Import a longer chain with some known data as prefix.
if err := inserter(append(blocks, blocks2...)); err != nil { if err := inserter(append(blocks, blocks2...), append(receipts, receipts2...)); err != nil {
t.Fatalf("failed to insert chain data: %v", err) t.Fatalf("failed to insert chain data: %v", err)
} }
asserter(t, blocks2[len(blocks2)-1]) asserter(t, blocks2[len(blocks2)-1])
@ -2454,7 +2454,7 @@ func testInsertKnownChainDataWithMerging(t *testing.T, typ string, mergeHeight i
// Import a shorter chain with some known data as prefix. // Import a shorter chain with some known data as prefix.
// The reorg is expected since the fork choice rule is // The reorg is expected since the fork choice rule is
// already changed. // already changed.
if err := inserter(append(blocks, blocks3...)); err != nil { if err := inserter(append(blocks, blocks3...), append(receipts, receipts3...)); err != nil {
t.Fatalf("failed to insert chain data: %v", err) t.Fatalf("failed to insert chain data: %v", err)
} }
// The head shouldn't change. // The head shouldn't change.
@ -2462,7 +2462,7 @@ func testInsertKnownChainDataWithMerging(t *testing.T, typ string, mergeHeight i
// Reimport the longer chain again, the reorg is still expected // Reimport the longer chain again, the reorg is still expected
chain.SetHead(rollback - 1) chain.SetHead(rollback - 1)
if err := inserter(append(blocks, blocks2...)); err != nil { if err := inserter(append(blocks, blocks2...), append(receipts, receipts2...)); err != nil {
t.Fatalf("failed to insert chain data: %v", err) t.Fatalf("failed to insert chain data: %v", err)
} }
asserter(t, blocks2[len(blocks2)-1]) asserter(t, blocks2[len(blocks2)-1])
@ -2618,7 +2618,7 @@ func testReorgToShorterRemovesCanonMappingHeaderChain(t *testing.T, scheme strin
} }
// Benchmarks large blocks with value transfers to non-existing accounts // Benchmarks large blocks with value transfers to non-existing accounts
func benchmarkLargeNumberOfValueToNonexisting(b *testing.B, numTxs, numBlocks int, recipientFn func(uint64) common.Address) { func benchmarkLargeNumberOfValueToNonexisting(b *testing.B, numTxs, numBlocks int, recipientFn func(uint64) common.Address, dataFn func(uint64) []byte) {
var ( var (
signer = types.HomesteadSigner{} signer = types.HomesteadSigner{}
testBankKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") testBankKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
@ -2681,8 +2681,10 @@ func BenchmarkBlockChain_1x1000ValueTransferToNonexisting(b *testing.B) {
recipientFn := func(nonce uint64) common.Address { recipientFn := func(nonce uint64) common.Address {
return common.BigToAddress(new(big.Int).SetUint64(1337 + nonce)) return common.BigToAddress(new(big.Int).SetUint64(1337 + nonce))
} }
dataFn := func(nonce uint64) []byte {
benchmarkLargeNumberOfValueToNonexisting(b, numTxs, numBlocks, recipientFn) return nil
}
benchmarkLargeNumberOfValueToNonexisting(b, numTxs, numBlocks, recipientFn, dataFn)
} }
func BenchmarkBlockChain_1x1000ValueTransferToExisting(b *testing.B) { func BenchmarkBlockChain_1x1000ValueTransferToExisting(b *testing.B) {
@ -2696,8 +2698,10 @@ func BenchmarkBlockChain_1x1000ValueTransferToExisting(b *testing.B) {
recipientFn := func(nonce uint64) common.Address { recipientFn := func(nonce uint64) common.Address {
return common.BigToAddress(new(big.Int).SetUint64(1337)) return common.BigToAddress(new(big.Int).SetUint64(1337))
} }
dataFn := func(nonce uint64) []byte {
benchmarkLargeNumberOfValueToNonexisting(b, numTxs, numBlocks, recipientFn) return nil
}
benchmarkLargeNumberOfValueToNonexisting(b, numTxs, numBlocks, recipientFn, dataFn)
} }
func BenchmarkBlockChain_1x1000Executions(b *testing.B) { func BenchmarkBlockChain_1x1000Executions(b *testing.B) {
@ -2711,7 +2715,10 @@ func BenchmarkBlockChain_1x1000Executions(b *testing.B) {
recipientFn := func(nonce uint64) common.Address { recipientFn := func(nonce uint64) common.Address {
return common.BigToAddress(new(big.Int).SetUint64(0xc0de)) return common.BigToAddress(new(big.Int).SetUint64(0xc0de))
} }
benchmarkLargeNumberOfValueToNonexisting(b, numTxs, numBlocks, recipientFn) dataFn := func(nonce uint64) []byte {
return nil
}
benchmarkLargeNumberOfValueToNonexisting(b, numTxs, numBlocks, recipientFn, dataFn)
} }
// Tests that importing a some old blocks, where all blocks are before the // Tests that importing a some old blocks, where all blocks are before the