update AddBlocksToStateWithFixedBranches

ChainSafe · Jan 31, 2022 · 6b841f4 · 6b841f4
1 parent 0ef9ea3
commit 6b841f4
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 33 deletions.
diff --git a/dot/core/service_integration_test.go b/dot/core/service_integration_test.go
@@ -279,7 +279,7 @@ func TestHandleChainReorg_WithReorg_NoTransactions(t *testing.T) {
 	height := 5
 	branch := 3
 	branches := map[int]int{branch: 1}
-	state.AddBlocksToStateWithFixedBranches(t, s.blockState.(*state.BlockState), height, branches, 0)
+	state.AddBlocksToStateWithFixedBranches(t, s.blockState.(*state.BlockState), height, branches)
 
 	leaves := s.blockState.(*state.BlockState).Leaves()
 	require.Equal(t, 2, len(leaves))

diff --git a/dot/rpc/modules/system_integration_test.go b/dot/rpc/modules/system_integration_test.go
@@ -319,11 +319,19 @@ func setupSystemModule(t *testing.T) *SystemModule {
 
 	err = chain.Storage.StoreTrie(ts, nil)
 	require.NoError(t, err)
+
+	digest := types.NewDigest()
+	prd, err := types.NewBabeSecondaryPlainPreDigest(0, 1).ToPreRuntimeDigest()
+	require.NoError(t, err)
+	err = digest.Add(*prd)
+	require.NoError(t, err)
+
 	err = chain.Block.AddBlock(&types.Block{
 		Header: types.Header{
 			Number:     big.NewInt(3),
 			ParentHash: chain.Block.BestBlockHash(),
 			StateRoot:  ts.MustRoot(),
+			Digest:     digest,
 		},
 		Body: types.Body{},
 	})

diff --git a/dot/state/test_helpers.go b/dot/state/test_helpers.go
@@ -152,7 +152,7 @@ func AddBlocksToState(t *testing.T, blockState *BlockState, depth int,
 
 // AddBlocksToStateWithFixedBranches adds blocks to a BlockState up to depth, with fixed branches
 // branches are provided with a map of depth -> # of branches
-func AddBlocksToStateWithFixedBranches(t *testing.T, blockState *BlockState, depth int, branches map[int]int, r byte) {
+func AddBlocksToStateWithFixedBranches(t *testing.T, blockState *BlockState, depth int, branches map[int]int) {
 	previousHash := blockState.BestBlockHash()
 	tb := []testBranch{}
 	arrivalTime := time.Now()

diff --git a/dot/sync/message_test.go b/dot/sync/message_test.go
@@ -368,7 +368,7 @@ func TestService_checkOrGetDescendantHash(t *testing.T) {
 	branches := map[int]int{
 		8: 1,
 	}
-	state.AddBlocksToStateWithFixedBranches(t, s.blockState.(*state.BlockState), 16, branches, 1)
+	state.AddBlocksToStateWithFixedBranches(t, s.blockState.(*state.BlockState), 16, branches)
 
 	// base case
 	ancestor, err := s.blockState.GetHashByNumber(big.NewInt(1))

diff --git a/lib/grandpa/grandpa_test.go b/lib/grandpa/grandpa_test.go
@@ -5,7 +5,6 @@ package grandpa
 
 import (
 	"math/big"
-	"math/rand"
 	"sort"
 	"sync"
 	"testing"
@@ -181,7 +180,7 @@ func TestGetVotesForBlock_NoDescendantVotes(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	// 1/3 of voters equivocate; ie. vote for both blocks
@@ -218,7 +217,7 @@ func TestGetVotesForBlock_DescendantVotes(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	a, err := st.Block.GetHeader(leaves[0])
@@ -270,7 +269,7 @@ func TestGetPossibleSelectedAncestors_SameAncestor(t *testing.T) {
 	// this creates a tree with 3 branches all starting at depth 6
 	branches := make(map[int]int)
 	branches[6] = 2
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, 0)
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 
 	leaves := gs.blockState.Leaves()
 	require.Equal(t, 3, len(leaves))
@@ -326,7 +325,7 @@ func TestGetPossibleSelectedAncestors_VaryingAncestor(t *testing.T) {
 	branches := make(map[int]int)
 	branches[6] = 1
 	branches[7] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 
 	leaves := gs.blockState.Leaves()
 	require.Equal(t, 3, len(leaves))
@@ -382,7 +381,7 @@ func TestGetPossibleSelectedAncestors_VaryingAncestor_MoreBranches(t *testing.T)
 	branches := make(map[int]int)
 	branches[6] = 2
 	branches[7] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 
 	leaves := gs.blockState.Leaves()
 	require.Equal(t, 4, len(leaves))
@@ -442,7 +441,7 @@ func TestGetPossibleSelectedBlocks_OneBlock(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	voteA, err := NewVoteFromHash(leaves[0], st.Block)
@@ -477,7 +476,7 @@ func TestGetPossibleSelectedBlocks_EqualVotes_SameAncestor(t *testing.T) {
 	branches := make(map[int]int)
 	branches[6] = 2
 
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 	require.Equal(t, 3, len(leaves))
 
@@ -525,7 +524,7 @@ func TestGetPossibleSelectedBlocks_EqualVotes_VaryingAncestor(t *testing.T) {
 	branches := make(map[int]int)
 	branches[6] = 1
 	branches[7] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 
 	leaves := gs.blockState.Leaves()
 	require.Equal(t, 3, len(leaves))
@@ -573,7 +572,7 @@ func TestGetPossibleSelectedBlocks_OneThirdEquivocating(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	// 1/3 of voters equivocate; ie. vote for both blocks
@@ -616,7 +615,7 @@ func TestGetPossibleSelectedBlocks_MoreThanOneThirdEquivocating(t *testing.T) {
 	branches := make(map[int]int)
 	branches[6] = 1
 	branches[7] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	// this tests a byzantine case where >1/3 of voters equivocate; ie. vote for multiple blocks
@@ -664,7 +663,7 @@ func TestGetPreVotedBlock_OneBlock(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	voteA, err := NewVoteFromHash(leaves[0], st.Block)
@@ -698,7 +697,7 @@ func TestGetPreVotedBlock_MultipleCandidates(t *testing.T) {
 	branches := make(map[int]int)
 	branches[6] = 1
 	branches[7] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 
 	leaves := gs.blockState.Leaves()
 	require.Equal(t, 3, len(leaves))
@@ -749,7 +748,7 @@ func TestGetPreVotedBlock_EvenMoreCandidates(t *testing.T) {
 	branches[5] = 1
 	branches[6] = 1
 	branches[7] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(0))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 
 	leaves := gs.blockState.Leaves()
 	require.Equal(t, 6, len(leaves))
@@ -817,7 +816,7 @@ func TestIsCompletable(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	voteA, err := NewVoteFromHash(leaves[0], st.Block)
@@ -855,7 +854,7 @@ func TestFindParentWithNumber(t *testing.T) {
 
 	// no branches needed
 	branches := make(map[int]int)
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	v, err := NewVoteFromHash(leaves[0], st.Block)
@@ -877,7 +876,7 @@ func TestGetBestFinalCandidate_OneBlock(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	voteA, err := NewVoteFromHash(leaves[0], st.Block)
@@ -916,7 +915,7 @@ func TestGetBestFinalCandidate_PrecommitAncestor(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	voteA, err := NewVoteFromHash(leaves[0], st.Block)
@@ -960,7 +959,7 @@ func TestGetBestFinalCandidate_NoPrecommit(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	voteA, err := NewVoteFromHash(leaves[0], st.Block)
@@ -997,7 +996,7 @@ func TestGetBestFinalCandidate_PrecommitOnAnotherChain(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	voteA, err := NewVoteFromHash(leaves[0], st.Block)
@@ -1093,7 +1092,7 @@ func TestIsFinalisable_True(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	voteA, err := NewVoteFromHash(leaves[0], st.Block)
@@ -1131,7 +1130,7 @@ func TestIsFinalisable_False(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[2] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 3, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 3, branches)
 	leaves := gs.blockState.Leaves()
 
 	voteA, err := NewVoteFromHash(leaves[0], st.Block)
@@ -1176,7 +1175,7 @@ func TestGetGrandpaGHOST_CommonAncestor(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	voteA, err := NewVoteFromHash(leaves[0], st.Block)
@@ -1213,7 +1212,7 @@ func TestGetGrandpaGHOST_MultipleCandidates(t *testing.T) {
 	branches := make(map[int]int)
 	branches[3] = 1
 	branches[7] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, byte(rand.Intn(256)))
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 	require.Equal(t, 3, len(leaves))
 

diff --git a/lib/grandpa/round_test.go b/lib/grandpa/round_test.go
@@ -420,7 +420,6 @@ func TestPlayGrandpaRound_WithEquivocation(t *testing.T) {
 	fins := make([]chan GrandpaMessage, len(kr.Keys))
 
 	done := false
-	r := byte(rand.Intn(256))
 
 	for i := range gss {
 		gs, in, out, fin := setupGrandpa(t, kr.Keys[i])
@@ -434,7 +433,7 @@ func TestPlayGrandpaRound_WithEquivocation(t *testing.T) {
 		// this creates a tree with 2 branches starting at depth 2
 		branches := make(map[int]int)
 		branches[2] = 1
-		state.AddBlocksToStateWithFixedBranches(t, gs.blockState.(*state.BlockState), 4, branches, r)
+		state.AddBlocksToStateWithFixedBranches(t, gs.blockState.(*state.BlockState), 4, branches)
 	}
 
 	// should have blocktree for all nodes

diff --git a/lib/grandpa/vote_message_test.go b/lib/grandpa/vote_message_test.go
@@ -72,7 +72,7 @@ func TestCheckForEquivocation_WithEquivocation(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, 0)
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	vote1, err := NewVoteFromHash(leaves[0], st.Block)
@@ -119,7 +119,7 @@ func TestCheckForEquivocation_WithExistingEquivocation(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, 0)
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	vote1, err := NewVoteFromHash(leaves[1], gs.blockState)
@@ -279,7 +279,7 @@ func TestValidateMessage_Equivocation(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, 0)
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	voteA, err := NewVoteFromHash(leaves[0], st.Block)
@@ -360,7 +360,7 @@ func TestValidateMessage_IsNotDescendant(t *testing.T) {
 
 	branches := make(map[int]int)
 	branches[6] = 1
-	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches, 0)
+	state.AddBlocksToStateWithFixedBranches(t, st.Block, 8, branches)
 	leaves := gs.blockState.Leaves()
 
 	gs.head, err = gs.blockState.GetHeader(leaves[0])