Skip to content

trie: using maps.Clone #29419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2024
Merged

trie: using maps.Clone #29419

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions trie/sync_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package trie
import (
"bytes"
"fmt"
"maps"
"math/rand"
"testing"

Expand Down Expand Up @@ -837,13 +838,6 @@ func testPivotMove(t *testing.T, scheme string, tiny bool) {
tr.Update(key, 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)
writeFn([]byte{0x01, 0x23}, nil, srcTrie, stateA)
Expand All @@ -866,7 +860,7 @@ func testPivotMove(t *testing.T, scheme string, tiny bool) {
checkTrieContents(t, destDisk, scheme, srcTrie.Hash().Bytes(), stateA, true)

// Delete element to collapse trie
stateB := copyStates(stateA)
stateB := maps.Clone(stateA)
srcTrie, _ = New(TrieID(rootA), srcTrieDB)
deleteFn([]byte{0x02, 0x34}, srcTrie, stateB)
deleteFn([]byte{0x13, 0x44}, srcTrie, stateB)
Expand All @@ -883,7 +877,7 @@ func testPivotMove(t *testing.T, scheme string, tiny bool) {
checkTrieContents(t, destDisk, scheme, srcTrie.Hash().Bytes(), stateB, true)

// Add elements to expand trie
stateC := copyStates(stateB)
stateC := maps.Clone(stateB)
srcTrie, _ = New(TrieID(rootB), srcTrieDB)

writeFn([]byte{0x01, 0x24}, stateA[string([]byte{0x01, 0x24})], srcTrie, stateC)
Expand Down Expand Up @@ -941,13 +935,6 @@ func testSyncAbort(t *testing.T, scheme string) {
tr.Update(key, 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 (
stateA = make(map[string][]byte)
Expand All @@ -972,7 +959,7 @@ func testSyncAbort(t *testing.T, scheme string) {
checkTrieContents(t, destDisk, scheme, srcTrie.Hash().Bytes(), stateA, true)

// Delete the element from the trie
stateB := copyStates(stateA)
stateB := maps.Clone(stateA)
srcTrie, _ = New(TrieID(rootA), srcTrieDB)
deleteFn(key, srcTrie, stateB)

Expand All @@ -999,7 +986,7 @@ func testSyncAbort(t *testing.T, scheme string) {
}})

// Add elements to expand trie
stateC := copyStates(stateB)
stateC := maps.Clone(stateB)
srcTrie, _ = New(TrieID(rootB), srcTrieDB)

writeFn(key, val, srcTrie, stateC)
Expand Down