WIP

ChainSafe · Oct 5, 2022 · f848961 · f848961
1 parent 7aa5ea7
commit f848961
Show file tree

Hide file tree

Showing 6 changed files with 450 additions and 89 deletions.
diff --git a/dot/state/offline_pruner.go b/dot/state/offline_pruner.go
@@ -121,7 +121,8 @@ func (p *OfflinePruner) SetBloomFilter() (err error) {
 			return err
 		}
 
-		trie.PopulateMerkleValues(tr.RootNode(), merkleValues)
+		const excludeInlined = false
+		trie.PopulateMerkleValues(tr.RootNode(), merkleValues, excludeInlined)
 
 		// get parent header of current block
 		header, err = p.blockState.GetHeader(header.ParentHash)

diff --git a/lib/trie/database.go b/lib/trie/database.go
@@ -189,7 +189,7 @@ func (t *Trie) loadNode(db Database, n *Node) error {
 // all its descendant nodes as keys to the map merkleValues.
 // It is assumed the node and its descendant nodes have their Merkle value already
 // computed.
-func PopulateMerkleValues(n *Node, merkleValues map[string]struct{}) {
+func PopulateMerkleValues(n *Node, merkleValues map[string]struct{}, excludeInlined bool) {
 	if n == nil {
 		return
 	}
@@ -198,15 +198,18 @@ func PopulateMerkleValues(n *Node, merkleValues map[string]struct{}) {
 		panic(fmt.Sprintf("node with key 0x%x has no Merkle value computed", n.Key))
 	}
 
-	merkleValues[string(n.MerkleValue)] = struct{}{}
+	isInlined := len(n.MerkleValue) < 32
+	if !excludeInlined || !isInlined {
+		merkleValues[string(n.MerkleValue)] = struct{}{}
+	}
 
 	if n.Kind() == node.Leaf {
 		return
 	}
 
 	branch := n
 	for _, child := range branch.Children {
-		PopulateMerkleValues(child, merkleValues)
+		PopulateMerkleValues(child, merkleValues, excludeInlined)
 	}
 }
 

diff --git a/lib/trie/database_test.go b/lib/trie/database_test.go
@@ -162,9 +162,10 @@ func Test_PopulateMerkleValues(t *testing.T) {
 	t.Parallel()
 
 	testCases := map[string]struct {
-		node         *Node
-		merkleValues map[string]struct{}
-		panicValue   interface{}
+		node           *Node
+		excludeInlined bool
+		merkleValues   map[string]struct{}
+		panicValue     interface{}
 	}{
 		"nil node": {
 			merkleValues: map[string]struct{}{},
@@ -191,6 +192,16 @@ func Test_PopulateMerkleValues(t *testing.T) {
 				"b": {},
 			},
 		},
+		"exclude inlined": {
+			node: &Node{
+				MerkleValue: []byte("a"),
+				Children: padRightChildren([]*Node{
+					{MerkleValue: []byte("b")},
+				}),
+			},
+			excludeInlined: true,
+			merkleValues:   map[string]struct{}{},
+		},
 		"nested branch node": {
 			node: &Node{
 				MerkleValue: []byte("a"),
@@ -222,12 +233,12 @@ func Test_PopulateMerkleValues(t *testing.T) {
 
 			if testCase.panicValue != nil {
 				assert.PanicsWithValue(t, testCase.panicValue, func() {
-					PopulateMerkleValues(testCase.node, merkleValues)
+					PopulateMerkleValues(testCase.node, merkleValues, testCase.excludeInlined)
 				})
 				return
 			}
 
-			PopulateMerkleValues(testCase.node, merkleValues)
+			PopulateMerkleValues(testCase.node, merkleValues, testCase.excludeInlined)
 
 			assert.Equal(t, testCase.merkleValues, merkleValues)
 		})