tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trie: using maps.Clone (#29419)

Browse Source
This commit is contained in:
cui 2024-04-01 11:42:50 +08:00 committed by GitHub
parent a3829178af
commit c39d00e316
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
trie/sync_test.go
View File

@ -19,6 +19,7 @@ package trie
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"maps"
"math/rand" "math/rand"
"testing" "testing"
@ -837,13 +838,6 @@ func testPivotMove(t *testing.T, scheme string, tiny bool) {
tr.Update(key, val) tr.Update(key, val)
states[string(key)] = common.CopyBytes(val) states[string(key)] = common.CopyBytes(val)
} }
copyStates = func(states map[string][]byte) map[string][]byte {
cpy := make(map[string][]byte)
for k, v := range states {
cpy[k] = v
}
return cpy
}
) )
stateA := make(map[string][]byte) stateA := make(map[string][]byte)
writeFn([]byte{0x01, 0x23}, nil, srcTrie, stateA) writeFn([]byte{0x01, 0x23}, nil, srcTrie, stateA)
@ -866,7 +860,7 @@ func testPivotMove(t *testing.T, scheme string, tiny bool) {
checkTrieContents(t, destDisk, scheme, srcTrie.Hash().Bytes(), stateA, true) checkTrieContents(t, destDisk, scheme, srcTrie.Hash().Bytes(), stateA, true)
// Delete element to collapse trie // Delete element to collapse trie
stateB := copyStates(stateA) stateB := maps.Clone(stateA)
srcTrie, _ = New(TrieID(rootA), srcTrieDB) srcTrie, _ = New(TrieID(rootA), srcTrieDB)
deleteFn([]byte{0x02, 0x34}, srcTrie, stateB) deleteFn([]byte{0x02, 0x34}, srcTrie, stateB)
deleteFn([]byte{0x13, 0x44}, srcTrie, stateB) deleteFn([]byte{0x13, 0x44}, srcTrie, stateB)
@ -883,7 +877,7 @@ func testPivotMove(t *testing.T, scheme string, tiny bool) {
checkTrieContents(t, destDisk, scheme, srcTrie.Hash().Bytes(), stateB, true) checkTrieContents(t, destDisk, scheme, srcTrie.Hash().Bytes(), stateB, true)
// Add elements to expand trie // Add elements to expand trie
stateC := copyStates(stateB) stateC := maps.Clone(stateB)
srcTrie, _ = New(TrieID(rootB), srcTrieDB) srcTrie, _ = New(TrieID(rootB), srcTrieDB)
writeFn([]byte{0x01, 0x24}, stateA[string([]byte{0x01, 0x24})], srcTrie, stateC) writeFn([]byte{0x01, 0x24}, stateA[string([]byte{0x01, 0x24})], srcTrie, stateC)
@ -941,13 +935,6 @@ func testSyncAbort(t *testing.T, scheme string) {
tr.Update(key, val) tr.Update(key, val)
states[string(key)] = common.CopyBytes(val) states[string(key)] = common.CopyBytes(val)
} }
copyStates = func(states map[string][]byte) map[string][]byte {
cpy := make(map[string][]byte)
for k, v := range states {
cpy[k] = v
}
return cpy
}
) )
var ( var (
stateA = make(map[string][]byte) stateA = make(map[string][]byte)
@ -972,7 +959,7 @@ func testSyncAbort(t *testing.T, scheme string) {
checkTrieContents(t, destDisk, scheme, srcTrie.Hash().Bytes(), stateA, true) checkTrieContents(t, destDisk, scheme, srcTrie.Hash().Bytes(), stateA, true)
// Delete the element from the trie // Delete the element from the trie
stateB := copyStates(stateA) stateB := maps.Clone(stateA)
srcTrie, _ = New(TrieID(rootA), srcTrieDB) srcTrie, _ = New(TrieID(rootA), srcTrieDB)
deleteFn(key, srcTrie, stateB) deleteFn(key, srcTrie, stateB)
@ -999,7 +986,7 @@ func testSyncAbort(t *testing.T, scheme string) {
}}) }})
// Add elements to expand trie // Add elements to expand trie
stateC := copyStates(stateB) stateC := maps.Clone(stateB)
srcTrie, _ = New(TrieID(rootB), srcTrieDB) srcTrie, _ = New(TrieID(rootB), srcTrieDB)
writeFn(key, val, srcTrie, stateC) writeFn(key, val, srcTrie, stateC)