Use GetDescendants instead of accessing Descendants directly

qdm12 · qdm12 · commit 6c982dd82714 · 2022-03-15T16:03:15.000Z
diff --git a/internal/trie/node/copy.go b/internal/trie/node/copy.go
@@ -10,7 +10,7 @@ func (b *Branch) Copy(copyChildren bool) Node {
 	cpy := &Branch{
 		Dirty:       b.Dirty,
 		Generation:  b.Generation,
-		Descendants: b.Descendants,
+		Descendants: b.GetDescendants(),
 	}
 
 	if copyChildren {
diff --git a/lib/trie/trie_endtoend_test.go b/lib/trie/trie_endtoend_test.go
@@ -1132,7 +1132,7 @@ func countNodesFromStats(root Node) (nodesCount uint32) {
 	} else if root.Type() == node.LeafType {
 		return 1
 	}
-	return 1 + root.(*node.Branch).Descendants
+	return 1 + root.(*node.Branch).GetDescendants()
 }
 
 func testDescendants(t *testing.T, root Node) {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ func (b *Branch) Copy(copyChildren bool) Node {`
`10`	`10`	`cpy := &Branch{`
`11`	`11`	`Dirty: b.Dirty,`
`12`	`12`	`Generation: b.Generation,`
`13`		`- Descendants: b.Descendants,`
	`13`	`+ Descendants: b.GetDescendants(),`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`if copyChildren {`
Original file line number	Diff line number	Diff line change
`@@ -1132,7 +1132,7 @@ func countNodesFromStats(root Node) (nodesCount uint32) {`
`1132`	`1132`	`} else if root.Type() == node.LeafType {`
`1133`	`1133`	`return 1`
`1134`	`1134`	`}`
`1135`		`- return 1 + root.(*node.Branch).Descendants`
	`1135`	`+ return 1 + root.(*node.Branch).GetDescendants()`
`1136`	`1136`	`}`
`1137`	`1137`
`1138`	`1138`	`func testDescendants(t *testing.T, root Node) {`