mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-03-23 03:18:07 +00:00
fix some incorrect shuffling
This commit is contained in:
parent
c61d2d307d
commit
9f89625a0d
1 changed files with 4 additions and 11 deletions
|
|
@ -309,11 +309,7 @@ func (db *CachingDB) ReadersWithCacheStats(stateRoot common.Hash) (ReaderWithSta
|
|||
func (db *CachingDB) OpenTrie(root common.Hash) (Trie, error) {
|
||||
reader, err := db.triedb.StateReader(root)
|
||||
if err != nil {
|
||||
tr, err := trie.NewStateTrie(trie.StateTrieID(root), db.triedb)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return tr, nil
|
||||
return nil, err
|
||||
}
|
||||
flatReader := newFlatReader(reader)
|
||||
|
||||
|
|
@ -328,17 +324,14 @@ func (db *CachingDB) OpenTrie(root common.Hash) (Trie, error) {
|
|||
return bt, nil
|
||||
}
|
||||
|
||||
base, err := trie.NewStateTrie(trie.StateTrieID(root), db.triedb)
|
||||
base, err := trie.NewStateTrie(trie.StateTrieID(ts.BaseRoot), db.triedb)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("could not create base trie in OpenTrie: %w", err)
|
||||
}
|
||||
return transitiontrie.NewTransitionTrie(base, bt, false), nil
|
||||
}
|
||||
tr, err := trie.NewStateTrie(trie.StateTrieID(root), db.triedb)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return tr, nil
|
||||
|
||||
return trie.NewStateTrie(trie.StateTrieID(root), db.triedb)
|
||||
}
|
||||
|
||||
// OpenStorageTrie opens the storage trie of an account.
|
||||
|
|
|
|||
Loading…
Reference in a new issue