From 50159204e3d7d8768f4e607923bbdaab9f882272 Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Tue, 18 Oct 2022 07:51:12 +0000
Subject: [PATCH] Minor test changes

---
 lib/trie/trie_test.go | 100 +++++++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 45 deletions(-)

diff --git a/lib/trie/trie_test.go b/lib/trie/trie_test.go
index e25a52c4ee0..45ff36c116f 100644
--- a/lib/trie/trie_test.go
+++ b/lib/trie/trie_test.go
@@ -1255,14 +1255,15 @@ func Test_Trie_insert(t *testing.T) {
 	t.Parallel()
 
 	testCases := map[string]struct {
-		trie                Trie
-		parent              *Node
-		key                 []byte
-		value               []byte
-		deletedMerkleValues map[string]struct{}
-		newNode             *Node
-		mutated             bool
-		nodesCreated        uint32
+		trie                        Trie
+		parent                      *Node
+		key                         []byte
+		value                       []byte
+		deletedMerkleValues         map[string]struct{}
+		newNode                     *Node
+		mutated                     bool
+		nodesCreated                uint32
+		expectedDeletedMerkleValues map[string]struct{}
 	}{
 		"nil parent": {
 			trie: Trie{
@@ -1479,6 +1480,7 @@ func Test_Trie_insert(t *testing.T) {
 			assert.Equal(t, testCase.mutated, mutated)
 			assert.Equal(t, testCase.nodesCreated, nodesCreated)
 			assert.Equal(t, expectedTrie, trie)
+			assert.Equal(t, testCase.expectedDeletedMerkleValues, testCase.deletedMerkleValues)
 		})
 	}
 }
@@ -2383,17 +2385,18 @@ func Test_Trie_clearPrefixLimitAtNode(t *testing.T) {
 	t.Parallel()
 
 	testCases := map[string]struct {
-		trie                Trie
-		parent              *Node
-		prefix              []byte
-		limit               uint32
-		deletedMerkleValues map[string]struct{}
-		newParent           *Node
-		valuesDeleted       uint32
-		nodesRemoved        uint32
-		allDeleted          bool
-		errSentinel         error
-		errMessage          string
+		trie                        Trie
+		parent                      *Node
+		prefix                      []byte
+		limit                       uint32
+		deletedMerkleValues         map[string]struct{}
+		newParent                   *Node
+		valuesDeleted               uint32
+		nodesRemoved                uint32
+		allDeleted                  bool
+		errSentinel                 error
+		errMessage                  string
+		expectedDeletedMerkleValues map[string]struct{}
 	}{
 		"limit is zero": {
 			allDeleted: true,
@@ -2931,6 +2934,7 @@ func Test_Trie_clearPrefixLimitAtNode(t *testing.T) {
 			assert.Equal(t, testCase.nodesRemoved, nodesRemoved)
 			assert.Equal(t, testCase.allDeleted, allDeleted)
 			assert.Equal(t, expectedTrie, trie)
+			assert.Equal(t, testCase.expectedDeletedMerkleValues, testCase.deletedMerkleValues)
 		})
 	}
 }
@@ -2939,15 +2943,16 @@ func Test_Trie_deleteNodesLimit(t *testing.T) {
 	t.Parallel()
 
 	testCases := map[string]struct {
-		trie                Trie
-		parent              *Node
-		limit               uint32
-		deletedMerkleValues map[string]struct{}
-		newNode             *Node
-		valuesDeleted       uint32
-		nodesRemoved        uint32
-		errSentinel         error
-		errMessage          string
+		trie                        Trie
+		parent                      *Node
+		limit                       uint32
+		deletedMerkleValues         map[string]struct{}
+		newNode                     *Node
+		valuesDeleted               uint32
+		nodesRemoved                uint32
+		errSentinel                 error
+		errMessage                  string
+		expectedDeletedMerkleValues map[string]struct{}
 	}{
 		"zero limit": {
 			trie: Trie{
@@ -3115,6 +3120,7 @@ func Test_Trie_deleteNodesLimit(t *testing.T) {
 			assert.Equal(t, testCase.valuesDeleted, valuesDeleted)
 			assert.Equal(t, testCase.nodesRemoved, nodesRemoved)
 			assert.Equal(t, expectedTrie, trie)
+			assert.Equal(t, testCase.expectedDeletedMerkleValues, testCase.deletedMerkleValues)
 		})
 	}
 }
@@ -3222,13 +3228,14 @@ func Test_Trie_clearPrefixAtNode(t *testing.T) {
 	t.Parallel()
 
 	testCases := map[string]struct {
-		trie                Trie
-		parent              *Node
-		prefix              []byte
-		deletedMerkleValues map[string]struct{}
-		newParent           *Node
-		nodesRemoved        uint32
-		expectedTrie        Trie
+		trie                        Trie
+		parent                      *Node
+		prefix                      []byte
+		deletedMerkleValues         map[string]struct{}
+		newParent                   *Node
+		nodesRemoved                uint32
+		expectedTrie                Trie
+		expectedDeletedMerkleValues map[string]struct{}
 	}{
 		"delete one of two children of branch": {
 			trie: Trie{
@@ -3546,6 +3553,7 @@ func Test_Trie_clearPrefixAtNode(t *testing.T) {
 			assert.Equal(t, testCase.newParent, newParent)
 			assert.Equal(t, testCase.nodesRemoved, nodesRemoved)
 			assert.Equal(t, testCase.expectedTrie, trie)
+			assert.Equal(t, testCase.expectedDeletedMerkleValues, testCase.deletedMerkleValues)
 		})
 	}
 }
@@ -3667,16 +3675,17 @@ func Test_Trie_deleteAtNode(t *testing.T) {
 	t.Parallel()
 
 	testCases := map[string]struct {
-		trie                Trie
-		parent              *Node
-		key                 []byte
-		deletedMerkleValues map[string]struct{}
-		newParent           *Node
-		updated             bool
-		nodesRemoved        uint32
-		errSentinel         error
-		errMessage          string
-		expectedTrie        Trie
+		trie                        Trie
+		parent                      *Node
+		key                         []byte
+		deletedMerkleValues         map[string]struct{}
+		newParent                   *Node
+		updated                     bool
+		nodesRemoved                uint32
+		errSentinel                 error
+		errMessage                  string
+		expectedTrie                Trie
+		expectedDeletedMerkleValues map[string]struct{}
 	}{
 		"nil parent": {
 			key: []byte{1},
@@ -4018,6 +4027,7 @@ func Test_Trie_deleteAtNode(t *testing.T) {
 			assert.Equal(t, testCase.nodesRemoved, nodesRemoved)
 			assert.Equal(t, testCase.expectedTrie, testCase.trie)
 			assert.Equal(t, expectedKey, testCase.key)
+			assert.Equal(t, testCase.expectedDeletedMerkleValues, testCase.deletedMerkleValues)
 		})
 	}
 }