Remove Stats structure

internal/trie/node/branch.go

@@ -30,7 +30,12 @@ type Branch struct {
 	// which is updated to match the trie Generation once they are
 	// inserted, moved or iterated over.
 	Generation uint64
-	Stats      Stats
+
+	// Statistics
+
+	// Descendants is the number of descendant nodes for
+	// this particular node.
+	Descendants uint32
 }
 
 // NewBranch creates a new branch using the arguments given.

internal/trie/node/copy.go

@@ -8,9 +8,9 @@ package node
 // children as well.
 func (b *Branch) Copy(copyChildren bool) Node {
 	cpy := &Branch{
-		Dirty:      b.Dirty,
-		Generation: b.Generation,
-		Stats:      b.Stats,
+		Dirty:       b.Dirty,
+		Generation:  b.Generation,
+		Descendants: b.Descendants,
 	}
 
 	if copyChildren {

internal/trie/node/stats.go

@@ -1,30 +1,16 @@
 package node
 
-// Stats contains statistical information for a node.
-type Stats struct {
-	// Descendants is the number of descendant nodes for
-	// this particular node.
-	Descendants uint32
-}
-
-// NewStats creates a new Stats structure given the arguments.
-func NewStats(descendants uint32) Stats {
-	return Stats{
-		Descendants: descendants,
-	}
-}
-
 // GetDescendants returns the number of descendants in the branch.
 func (b *Branch) GetDescendants() (descendants uint32) {
-	return b.Stats.Descendants
+	return b.Descendants
 }
 
 // AddDescendants adds descendant nodes count to the node stats.
 func (b *Branch) AddDescendants(n uint32) {
-	b.Stats.Descendants += n
+	b.Descendants += n
 }
 
 // SubDescendants subtracts descendant nodes count from the node stats.
 func (b *Branch) SubDescendants(n uint32) {
-	b.Stats.Descendants -= n
+	b.Descendants -= n
 }

internal/trie/node/stats_test.go

@@ -6,26 +6,12 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func Test_NewStats(t *testing.T) {
-	t.Parallel()
-
-	const descendants uint32 = 10
-	stats := NewStats(descendants)
-
-	expected := Stats{
-		Descendants: descendants,
-	}
-	assert.Equal(t, expected, stats)
-}
-
 func Test_Branch_GetDescendants(t *testing.T) {
 	t.Parallel()
 
 	const descendants uint32 = 10
 	branch := &Branch{
-		Stats: Stats{
-			Descendants: descendants,
-		},
+		Descendants: descendants,
 	}
 	result := branch.GetDescendants()
 
@@ -41,15 +27,11 @@ func Test_Branch_AddDescendants(t *testing.T) {
 		finalDescendants   uint32 = 12
 	)
 	branch := &Branch{
-		Stats: Stats{
-			Descendants: initialDescendants,
-		},
+		Descendants: initialDescendants,
 	}
 	branch.AddDescendants(addDescendants)
 	expected := &Branch{
-		Stats: Stats{
-			Descendants: finalDescendants,
-		},
+		Descendants: finalDescendants,
 	}
 
 	assert.Equal(t, expected, branch)
@@ -64,15 +46,11 @@ func Test_Branch_SubDescendants(t *testing.T) {
 		finalDescendants   uint32 = 8
 	)
 	branch := &Branch{
-		Stats: Stats{
-			Descendants: initialDescendants,
-		},
+		Descendants: initialDescendants,
 	}
 	branch.SubDescendants(subDescendants)
 	expected := &Branch{
-		Stats: Stats{
-			Descendants: finalDescendants,
-		},
+		Descendants: finalDescendants,
 	}
 
 	assert.Equal(t, expected, branch)

lib/trie/trie.go

@@ -1091,10 +1091,8 @@ func handleDeletion(branch *node.Branch, key []byte) (newNode Node, branchChildM
 			Value:      childBranch.Value,
 			Generation: branch.Generation,
 			Dirty:      true,
-			Stats: node.Stats{
-				// this is the descendants of the original branch minus one
-				Descendants: childBranch.GetDescendants(),
-			},
+			// this is the descendants of the original branch minus one
+			Descendants: childBranch.GetDescendants(),
 		}
 
 		// Adopt the grand-children