Skip to content

Commit 699db96

Browse files
qdm12qdm12
committed
Test helper newDeltas 
1 parent 0f30578 commit 699db96

File tree

2 files changed

+46
-79
lines changed

2 files changed

+46
-79
lines changed

‎lib/trie/helpers_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,11 @@ func checkMerkleValuesAreSet(t *testing.T, n *Node) {
138138
}
139139
}
140140

141-
func newDeltas(deleted []common.Hash) (deltas *tracking.Deltas) {
141+
func newDeltas(deletedNodeHashesHex ...string) (deltas *tracking.Deltas) {
142142
deltas = tracking.New()
143-
for _, hash := range deleted {
144-
deltas.RecordDeleted(hash)
143+
for _, deletedNodeHashHex := range deletedNodeHashesHex {
144+
nodeHash := common.MustHexToHash(deletedNodeHashHex)
145+
deltas.RecordDeleted(nodeHash)
145146
}
146147
return deltas
147148
}

‎lib/trie/trie_test.go

Lines changed: 42 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ func Test_NewTrie(t *testing.T) {
5757
func Test_Trie_Snapshot(t *testing.T) {
5858
t.Parallel()
5959

60-
emptyDeltas := newDeltas(nil)
61-
setDeltas := newDeltas([]common.Hash{{1}})
60+
emptyDeltas := newDeltas()
61+
setDeltas := newDeltas("0x01")
6262

6363
trie := &Trie{
6464
generation: 8,
@@ -113,34 +113,34 @@ func Test_Trie_handleTrackedDeltas(t *testing.T) {
113113
"no success and generation 1": {
114114
trie: Trie{
115115
generation: 1,
116-
deltas: newDeltas([]common.Hash{{1}}),
116+
deltas: newDeltas("0x01"),
117117
},
118-
pendingDeltas: newDeltas([]common.Hash{{2}}),
118+
pendingDeltas: newDeltas("0x02"),
119119
expectedTrie: Trie{
120120
generation: 1,
121-
deltas: newDeltas([]common.Hash{{1}}),
121+
deltas: newDeltas("0x01"),
122122
},
123123
},
124124
"success and generation 0": {
125125
trie: Trie{
126-
deltas: newDeltas([]common.Hash{{1}}),
126+
deltas: newDeltas("0x01"),
127127
},
128128
success: true,
129-
pendingDeltas: newDeltas([]common.Hash{{2}}),
129+
pendingDeltas: newDeltas("0x02"),
130130
expectedTrie: Trie{
131-
deltas: newDeltas([]common.Hash{{1}}),
131+
deltas: newDeltas("0x01"),
132132
},
133133
},
134134
"success and generation 1": {
135135
trie: Trie{
136136
generation: 1,
137-
deltas: newDeltas([]common.Hash{{1}}),
137+
deltas: newDeltas("0x01"),
138138
},
139139
success: true,
140-
pendingDeltas: newDeltas([]common.Hash{{1}, {2}}),
140+
pendingDeltas: newDeltas("0x01", "0x02"),
141141
expectedTrie: Trie{
142142
generation: 1,
143-
deltas: newDeltas([]common.Hash{{1}, {2}}),
143+
deltas: newDeltas("0x01", "0x02"),
144144
},
145145
},
146146
}
@@ -207,7 +207,7 @@ func Test_Trie_prepForMutation(t *testing.T) {
207207
trie: Trie{
208208
generation: 2,
209209
},
210-
pendingDeltas: newDeltas(nil),
210+
pendingDeltas: newDeltas(),
211211
currentNode: &Node{
212212
Generation: 1,
213213
PartialKey: []byte{1},
@@ -228,11 +228,8 @@ func Test_Trie_prepForMutation(t *testing.T) {
228228
25, 26, 27, 28, 29, 30, 31, 32},
229229
Dirty: true,
230230
},
231-
copied: true,
232-
expectedPendingDeltas: newDeltas([]common.Hash{{
233-
0x98, 0xfc, 0xd6, 0x6b, 0xa3, 0x12, 0xc2, 0x9e, 0xf1, 0x93, 0x5, 0x2f, 0xd0, 0xc1, 0x4c, 0x6e,
234-
0x38, 0xb1, 0x58, 0xbd, 0x5c, 0x2, 0x35, 0x6, 0x45, 0x94, 0xca, 0xcc, 0x1a, 0xb5, 0x96, 0x5d,
235-
}}),
231+
copied: true,
232+
expectedPendingDeltas: newDeltas("0x98fcd66ba312c29ef193052fd0c14c6e38b158bd5c0235064594cacc1ab5965d"),
236233
},
237234
}
238235

@@ -287,15 +284,10 @@ func Test_Trie_registerDeletedMerkleValue(t *testing.T) {
287284
node: &Node{Dirty: true},
288285
},
289286
"clean root node registered": {
290-
node: someSmallNode,
291-
trie: Trie{root: someSmallNode},
292-
pendingDeltas: newDeltas(nil),
293-
expectedPendingDeltas: newDeltas([]common.Hash{{
294-
0x60, 0x51, 0x6d, 0x0b, 0xb6, 0xe1, 0xbb, 0xfb,
295-
0x12, 0x93, 0xf1, 0xb2, 0x76, 0xea, 0x95, 0x05,
296-
0xe9, 0xf4, 0xa4, 0xe7, 0xd9, 0x8f, 0x62, 0x0d,
297-
0x05, 0x11, 0x5e, 0x0b, 0x85, 0x27, 0x4a, 0xe1,
298-
}}),
287+
node: someSmallNode,
288+
trie: Trie{root: someSmallNode},
289+
pendingDeltas: newDeltas(),
290+
expectedPendingDeltas: newDeltas("0x60516d0bb6e1bbfb1293f1b276ea9505e9f4a4e7d98f620d05115e0b85274ae1"),
299291
expectedTrie: Trie{
300292
root: &Node{
301293
PartialKey: []byte{1},
@@ -323,11 +315,8 @@ func Test_Trie_registerDeletedMerkleValue(t *testing.T) {
323315
17, 18, 19, 20, 21, 22, 23, 24,
324316
25, 26, 27, 28, 29, 30, 31, 32},
325317
},
326-
pendingDeltas: newDeltas(nil),
327-
expectedPendingDeltas: newDeltas([]common.Hash{{
328-
0x98, 0xfc, 0xd6, 0x6b, 0xa3, 0x12, 0xc2, 0x9e, 0xf1, 0x93, 0x5, 0x2f, 0xd0, 0xc1, 0x4c, 0x6e,
329-
0x38, 0xb1, 0x58, 0xbd, 0x5c, 0x2, 0x35, 0x6, 0x45, 0x94, 0xca, 0xcc, 0x1a, 0xb5, 0x96, 0x5d,
330-
}}),
318+
pendingDeltas: newDeltas(),
319+
expectedPendingDeltas: newDeltas("0x98fcd66ba312c29ef193052fd0c14c6e38b158bd5c0235064594cacc1ab5965d"),
331320
},
332321
}
333322

@@ -410,10 +399,10 @@ func Test_Trie_DeepCopy(t *testing.T) {
410399
{1, 2, 3}: {
411400
generation: 2,
412401
root: &Node{PartialKey: []byte{1}, StorageValue: []byte{1}},
413-
deltas: newDeltas([]common.Hash{{1}, {2}}),
402+
deltas: newDeltas("0x01", "0x02"),
414403
},
415404
},
416-
deltas: newDeltas([]common.Hash{{1}, {2}}),
405+
deltas: newDeltas("0x01", "0x02"),
417406
},
418407
trieCopy: &Trie{
419408
generation: 1,
@@ -422,10 +411,10 @@ func Test_Trie_DeepCopy(t *testing.T) {
422411
{1, 2, 3}: {
423412
generation: 2,
424413
root: &Node{PartialKey: []byte{1}, StorageValue: []byte{1}},
425-
deltas: newDeltas([]common.Hash{{1}, {2}}),
414+
deltas: newDeltas("0x01", "0x02"),
426415
},
427416
},
428-
deltas: newDeltas([]common.Hash{{1}, {2}}),
417+
deltas: newDeltas("0x01", "0x02"),
429418
},
430419
},
431420
}
@@ -1069,7 +1058,7 @@ func Test_Trie_Put(t *testing.T) {
10691058
"trie with key and value": {
10701059
trie: Trie{
10711060
generation: 1,
1072-
deltas: newDeltas(nil),
1061+
deltas: newDeltas(),
10731062
root: &Node{
10741063
PartialKey: []byte{1, 2, 0, 5},
10751064
StorageValue: []byte{1},
@@ -1079,12 +1068,7 @@ func Test_Trie_Put(t *testing.T) {
10791068
value: []byte{2},
10801069
expectedTrie: Trie{
10811070
generation: 1,
1082-
deltas: newDeltas([]common.Hash{
1083-
{
1084-
0xa1, 0x95, 0x08, 0x9c, 0x3e, 0x8f, 0x8b, 0x5b, 0x36, 0x97, 0x87, 0x00, 0xad, 0x95, 0x4a, 0xed,
1085-
0x99, 0xe0, 0x84, 0x13, 0xcf, 0xc1, 0xe2, 0xb4, 0xc0, 0x0a, 0x5d, 0x06, 0x4a, 0xbe, 0x66, 0xa9,
1086-
},
1087-
}),
1071+
deltas: newDeltas("0xa195089c3e8f8b5b36978700ad954aed99e08413cfc1e2b4c00a5d064abe66a9"),
10881072
root: &Node{
10891073
PartialKey: []byte{1, 2},
10901074
Generation: 1,
@@ -1669,14 +1653,14 @@ func Test_LoadFromMap(t *testing.T) {
16691653
"nil data": {
16701654
expectedTrie: Trie{
16711655
childTries: map[common.Hash]*Trie{},
1672-
deltas: newDeltas(nil),
1656+
deltas: newDeltas(),
16731657
},
16741658
},
16751659
"empty data": {
16761660
data: map[string]string{},
16771661
expectedTrie: Trie{
16781662
childTries: map[common.Hash]*Trie{},
1679-
deltas: newDeltas(nil),
1663+
deltas: newDeltas(),
16801664
},
16811665
},
16821666
"bad key": {
@@ -1709,7 +1693,7 @@ func Test_LoadFromMap(t *testing.T) {
17091693
Dirty: true,
17101694
},
17111695
childTries: map[common.Hash]*Trie{},
1712-
deltas: newDeltas(nil),
1696+
deltas: newDeltas(),
17131697
},
17141698
},
17151699
"load key values": {
@@ -1739,7 +1723,7 @@ func Test_LoadFromMap(t *testing.T) {
17391723
}),
17401724
},
17411725
childTries: map[common.Hash]*Trie{},
1742-
deltas: newDeltas(nil),
1726+
deltas: newDeltas(),
17431727
},
17441728
},
17451729
}
@@ -3004,29 +2988,23 @@ func Test_Trie_ClearPrefix(t *testing.T) {
30042988
trie: Trie{
30052989
root: &Node{StorageValue: []byte{1}},
30062990
generation: 1,
3007-
deltas: newDeltas(nil),
2991+
deltas: newDeltas(),
30082992
},
30092993
expectedTrie: Trie{
30102994
generation: 1,
3011-
deltas: newDeltas([]common.Hash{{
3012-
0xf9, 0x6a, 0x74, 0x15, 0x22, 0xbc, 0xc1, 0x4f, 0x0a, 0xea, 0x2f, 0x70, 0x60, 0x44, 0x52, 0x24,
3013-
0x1d, 0x59, 0xb5, 0xf2, 0xdd, 0xab, 0x9a, 0x69, 0x48, 0xfd, 0xb3, 0xfe, 0xf5, 0xf9, 0x86, 0x43,
3014-
}}),
2995+
deltas: newDeltas("0xf96a741522bcc14f0aea2f70604452241d59b5f2ddab9a6948fdb3fef5f98643"),
30152996
},
30162997
},
30172998
"empty prefix": {
30182999
trie: Trie{
30193000
root: &Node{StorageValue: []byte{1}},
30203001
generation: 1,
3021-
deltas: newDeltas(nil),
3002+
deltas: newDeltas(),
30223003
},
30233004
prefix: []byte{},
30243005
expectedTrie: Trie{
30253006
generation: 1,
3026-
deltas: newDeltas([]common.Hash{{
3027-
0xf9, 0x6a, 0x74, 0x15, 0x22, 0xbc, 0xc1, 0x4f, 0x0a, 0xea, 0x2f, 0x70, 0x60, 0x44, 0x52, 0x24,
3028-
0x1d, 0x59, 0xb5, 0xf2, 0xdd, 0xab, 0x9a, 0x69, 0x48, 0xfd, 0xb3, 0xfe, 0xf5, 0xf9, 0x86, 0x43,
3029-
}}),
3007+
deltas: newDeltas("0xf96a741522bcc14f0aea2f70604452241d59b5f2ddab9a6948fdb3fef5f98643"),
30303008
},
30313009
},
30323010
"empty trie": {
@@ -3055,7 +3033,7 @@ func Test_Trie_ClearPrefix(t *testing.T) {
30553033
},
30563034
}),
30573035
},
3058-
deltas: newDeltas(nil),
3036+
deltas: newDeltas(),
30593037
},
30603038
prefix: []byte{0x12, 0x16},
30613039
expectedTrie: Trie{
@@ -3066,10 +3044,7 @@ func Test_Trie_ClearPrefix(t *testing.T) {
30663044
Generation: 1,
30673045
Dirty: true,
30683046
},
3069-
deltas: newDeltas([]common.Hash{{
3070-
0x5f, 0xe1, 0x08, 0xc8, 0x3d, 0x08, 0x32, 0x93, 0x53, 0xd6, 0x91, 0x8e, 0x01, 0x04, 0xda, 0xcc,
3071-
0x9d, 0x21, 0x87, 0xfd, 0x9d, 0xaf, 0xa5, 0x82, 0xd1, 0xc5, 0x32, 0xe5, 0xfe, 0x7b, 0x2e, 0x50,
3072-
}}),
3047+
deltas: newDeltas("0x5fe108c83d08329353d6918e0104dacc9d2187fd9dafa582d1c532e5fe7b2e50"),
30733048
},
30743049
},
30753050
}
@@ -3439,28 +3414,22 @@ func Test_Trie_Delete(t *testing.T) {
34393414
trie: Trie{
34403415
root: &Node{StorageValue: []byte{1}},
34413416
generation: 1,
3442-
deltas: newDeltas(nil),
3417+
deltas: newDeltas(),
34433418
},
34443419
expectedTrie: Trie{
34453420
generation: 1,
3446-
deltas: newDeltas([]common.Hash{{
3447-
0xf9, 0x6a, 0x74, 0x15, 0x22, 0xbc, 0xc1, 0x4f, 0x0a, 0xea, 0x2f, 0x70, 0x60, 0x44, 0x52, 0x24,
3448-
0x1d, 0x59, 0xb5, 0xf2, 0xdd, 0xab, 0x9a, 0x69, 0x48, 0xfd, 0xb3, 0xfe, 0xf5, 0xf9, 0x86, 0x43,
3449-
}}),
3421+
deltas: newDeltas("0xf96a741522bcc14f0aea2f70604452241d59b5f2ddab9a6948fdb3fef5f98643"),
34503422
},
34513423
},
34523424
"empty key": {
34533425
trie: Trie{
34543426
root: &Node{StorageValue: []byte{1}},
34553427
generation: 1,
3456-
deltas: newDeltas(nil),
3428+
deltas: newDeltas(),
34573429
},
34583430
expectedTrie: Trie{
34593431
generation: 1,
3460-
deltas: newDeltas([]common.Hash{{
3461-
0xf9, 0x6a, 0x74, 0x15, 0x22, 0xbc, 0xc1, 0x4f, 0x0a, 0xea, 0x2f, 0x70, 0x60, 0x44, 0x52, 0x24,
3462-
0x1d, 0x59, 0xb5, 0xf2, 0xdd, 0xab, 0x9a, 0x69, 0x48, 0xfd, 0xb3, 0xfe, 0xf5, 0xf9, 0x86, 0x43,
3463-
}}),
3432+
deltas: newDeltas("0xf96a741522bcc14f0aea2f70604452241d59b5f2ddab9a6948fdb3fef5f98643"),
34643433
},
34653434
},
34663435
"empty trie": {
@@ -3490,7 +3459,7 @@ func Test_Trie_Delete(t *testing.T) {
34903459
},
34913460
}),
34923461
},
3493-
deltas: newDeltas(nil),
3462+
deltas: newDeltas(),
34943463
},
34953464
key: []byte{0x12, 0x16},
34963465
expectedTrie: Trie{
@@ -3514,10 +3483,7 @@ func Test_Trie_Delete(t *testing.T) {
35143483
},
35153484
}),
35163485
},
3517-
deltas: newDeltas([]common.Hash{{
3518-
0x3d, 0x1b, 0x3d, 0x72, 0x7e, 0xe4, 0x04, 0x54, 0x9a, 0x5d, 0x25, 0x31, 0xaa, 0xb9, 0xff, 0xf0,
3519-
0xee, 0xdd, 0xc5, 0x8b, 0xc3, 0x0b, 0xfe, 0x2f, 0xe8, 0x2b, 0x1a, 0x0c, 0xfe, 0x7e, 0x76, 0xd5,
3520-
}}),
3486+
deltas: newDeltas("0x3d1b3d727ee404549a5d2531aab9fff0eeddc58bc30bfe2fe82b1a0cfe7e76d5"),
35213487
},
35223488
},
35233489
}

0 commit comments

Comments
 (0)