diff --git a/consensus/consortium/v2/consortium_test.go b/consensus/consortium/v2/consortium_test.go index 394e7b22c..deb8dc6f9 100644 --- a/consensus/consortium/v2/consortium_test.go +++ b/consensus/consortium/v2/consortium_test.go @@ -2218,7 +2218,7 @@ func testSystemTransactionOrder(t *testing.T, scheme string) { } func TestIsPeriodBlock(t *testing.T) { - //testIsPeriodBlock(t, rawdb.PathScheme) + testIsPeriodBlock(t, rawdb.PathScheme) testIsPeriodBlock(t, rawdb.HashScheme) } @@ -2301,7 +2301,11 @@ func testIsPeriodBlock(t *testing.T, scheme string) { block, _ := core.GenerateChain(&chainConfig, bs[len(bs)-1], ethash.NewFaker(), db, 1, callback, true) bs = append(bs, block...) } - if _, err := chain.InsertChain(bs[:], nil); err != nil { + // Only the new blocks are inserted here + // For path scheme, the number of db diff layers corresponding to blocks are limited to 128 + // So just the newest 128 blocks can be retrieved from the db + // Therefore, the handling of the inserted blocks can result in error since the older blocks can not be retrieved for checking + if _, err := chain.InsertChain(bs[399:], nil); err != nil { panic(err) } @@ -2321,15 +2325,9 @@ func testIsPeriodBlock(t *testing.T, scheme string) { } } -/* -Got issues related to parent layer missing in the test -panic: triedb parent [0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421] layer missing [recovered] -panic: triedb parent [0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421] layer missing -Will disable this test firstly for further investigation. -*/ func TestIsTrippEffective(t *testing.T) { testIsTrippEffective(t, rawdb.HashScheme) - // testIsTrippEffective(t, rawdb.PathScheme) + testIsTrippEffective(t, rawdb.PathScheme) } @@ -2416,7 +2414,11 @@ func testIsTrippEffective(t *testing.T, scheme string) { block, _ := core.GenerateChain(&chainConfig, bs[len(bs)-1], ethash.NewFaker(), db, 1, callback, true) bs = append(bs, block...) } - if _, err := chain.InsertChain(bs[:], nil); err != nil { + // Only the new blocks are inserted here + // For path scheme, the number of db diff layers corresponding to blocks are limited to 128 + // So just the newest 128 blocks can be retrieved from the db + // Therefore, the handling of the inserted blocks can result in error since the older blocks can not be retrieved for checking + if _, err := chain.InsertChain(bs[399:], nil); err != nil { panic(err) }