forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

trie: undo changes to insert

Browse source
This commit is contained in:
Martin Holst Swende 2023-10-24 14:13:11 +02:00
parent f820914bf1
commit 7642dd8e7a
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
trie/stacktrie.go
View file

@ -110,9 +110,7 @@ func (t *StackTrie) Update(key, value []byte) error {
} else { } else {
t.last = append(t.last[:0], k...) // reuse key slice t.last = append(t.last[:0], k...) // reuse key slice
} }
if err := t.insert(t.root, k, value, nil); err != nil { t.insert(t.root, k, value, nil)
return err
}
return nil return nil
} }
@ -194,7 +192,7 @@ func (n *stNode) getDiffIndex(key []byte) int {
// Helper function to that inserts a (key, value) pair into // Helper function to that inserts a (key, value) pair into
// the trie. // the trie.
func (t *StackTrie) insert(st *stNode, key, value []byte, path []byte) error { func (t *StackTrie) insert(st *stNode, key, value []byte, path []byte) {
switch st.typ { switch st.typ {
case branchNode: /* Branch */ case branchNode: /* Branch */
idx := int(key[0]) idx := int(key[0])
@ -213,7 +211,7 @@ func (t *StackTrie) insert(st *stNode, key, value []byte, path []byte) error {
if st.children[idx] == nil { if st.children[idx] == nil {
st.children[idx] = newLeaf(key[1:], value) st.children[idx] = newLeaf(key[1:], value)
} else { } else {
return t.insert(st.children[idx], key[1:], value, append(path, key[0])) t.insert(st.children[idx], key[1:], value, append(path, key[0]))
} }
case extNode: /* Ext */ case extNode: /* Ext */
@ -228,7 +226,8 @@ func (t *StackTrie) insert(st *stNode, key, value []byte, path []byte) error {
if diffidx == len(st.key) { if diffidx == len(st.key) {
// Ext key and key segment are identical, recurse into // Ext key and key segment are identical, recurse into
// the child node. // the child node.
return t.insert(st.children[0], key[diffidx:], value, append(path, key[:diffidx]...)) t.insert(st.children[0], key[diffidx:], value, append(path, key[:diffidx]...))
return
} }
// Save the original part. Depending if the break is // Save the original part. Depending if the break is
// at the extension's last byte or not, create an // at the extension's last byte or not, create an
@ -286,7 +285,7 @@ func (t *StackTrie) insert(st *stNode, key, value []byte, path []byte) error {
// keys differ, and 3) one leaf for the differentiated // keys differ, and 3) one leaf for the differentiated
// component of each key. // component of each key.
if diffidx >= len(st.key) { if diffidx >= len(st.key) {
return errors.New("trying to insert into existing key") panic("Trying to insert into existing key")
} }
// Check if the split occurs at the first nibble of the // Check if the split occurs at the first nibble of the
@ -328,12 +327,11 @@ func (t *StackTrie) insert(st *stNode, key, value []byte, path []byte) error {
st.val = value st.val = value
case hashedNode: case hashedNode:
return errors.New("trying to insert into hash") panic("trying to insert into hash")
default: default:
panic("invalid type") panic("invalid type")
} }
return nil
} }
// hash converts st into a 'hashedNode', if possible. Possible outcomes: // hash converts st into a 'hashedNode', if possible. Possible outcomes: