cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
pull from: v1.11.6-statediff-v5
merge into: cerc-io:master
Conversation 0 Commits 1565 Files Changed 1471 +8 -11
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d79bd2f0f6 - Show all commits

2
trie/proof.go
View File

@ -63,7 +63,7 @@ func (t *Trie) Prove(key []byte, fromLevel uint, proofDb ethdb.KeyValueWriter) e
var err error var err error
tn, err = t.resolveHash(n, prefix) tn, err = t.resolveHash(n, prefix)
if err != nil { if err != nil {
log.Error(fmt.Sprintf("Unhandled trie error: %v", err)) log.Error("Unhandled trie error in Trie.Prove", "err", err)
return err return err
} }
default: default:

8
trie/secure_trie.go
View File

@ -17,8 +17,6 @@
package trie package trie
import ( import (
"fmt"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
@ -74,7 +72,7 @@ func NewStateTrie(owner common.Hash, root common.Hash, db *Database) (*StateTrie
func (t *StateTrie) Get(key []byte) []byte { func (t *StateTrie) Get(key []byte) []byte {
res, err := t.TryGet(key) res, err := t.TryGet(key)
if err != nil { if err != nil {
log.Error(fmt.Sprintf("Unhandled trie error: %v", err)) log.Error("Unhandled trie error in StateTrie.Get", "err", err)
} }
return res return res
} }
@ -129,7 +127,7 @@ func (t *StateTrie) TryGetNode(path []byte) ([]byte, int, error) {
// stored in the trie. // stored in the trie.
func (t *StateTrie) Update(key, value []byte) { func (t *StateTrie) Update(key, value []byte) {
if err := t.TryUpdate(key, value); err != nil { if err := t.TryUpdate(key, value); err != nil {
log.Error(fmt.Sprintf("Unhandled trie error: %v", err)) log.Error("Unhandled trie error in StateTrie.Update", "err", err)
} }
} }
@ -169,7 +167,7 @@ func (t *StateTrie) TryUpdateAccount(key []byte, acc *types.StateAccount) error
// Delete removes any existing value for key from the trie. // Delete removes any existing value for key from the trie.
func (t *StateTrie) Delete(key []byte) { func (t *StateTrie) Delete(key []byte) {
if err := t.TryDelete(key); err != nil { if err := t.TryDelete(key); err != nil {
log.Error(fmt.Sprintf("Unhandled trie error: %v", err)) log.Error("Unhandled trie error in StateTrie.Delete", "err", err)
} }
} }

3
trie/stacktrie.go
View File

@ -21,7 +21,6 @@ import (
"bytes" "bytes"
"encoding/gob" "encoding/gob"
"errors" "errors"
"fmt"
"io" "io"
"sync" "sync"
@ -207,7 +206,7 @@ func (st *StackTrie) TryUpdate(key, value []byte) error {
func (st *StackTrie) Update(key, value []byte) { func (st *StackTrie) Update(key, value []byte) {
if err := st.TryUpdate(key, value); err != nil { if err := st.TryUpdate(key, value); err != nil {
log.Error(fmt.Sprintf("Unhandled trie error: %v", err)) log.Error("Unhandled trie error in StackTrie.Update", "err", err)
} }
} }

6
trie/trie.go
View File

@ -132,7 +132,7 @@ func (t *Trie) NodeIterator(start []byte) NodeIterator {
func (t *Trie) Get(key []byte) []byte { func (t *Trie) Get(key []byte) []byte {
res, err := t.TryGet(key) res, err := t.TryGet(key)
if err != nil { if err != nil {
log.Error(fmt.Sprintf("Unhandled trie error: %v", err)) log.Error("Unhandled trie error in Trie.Get", "err", err)
} }
return res return res
} }
@ -269,7 +269,7 @@ func (t *Trie) tryGetNode(origNode node, path []byte, pos int) (item []byte, new
// stored in the trie. // stored in the trie.
func (t *Trie) Update(key, value []byte) { func (t *Trie) Update(key, value []byte) {
if err := t.TryUpdate(key, value); err != nil { if err := t.TryUpdate(key, value); err != nil {
log.Error(fmt.Sprintf("Unhandled trie error: %v", err)) log.Error("Unhandled trie error in Trie.Update", "err", err)
} }
} }
@ -388,7 +388,7 @@ func (t *Trie) insert(n node, prefix, key []byte, value node) (bool, node, error
// Delete removes any existing value for key from the trie. // Delete removes any existing value for key from the trie.
func (t *Trie) Delete(key []byte) { func (t *Trie) Delete(key []byte) {
if err := t.TryDelete(key); err != nil { if err := t.TryDelete(key); err != nil {
log.Error(fmt.Sprintf("Unhandled trie error: %v", err)) log.Error("Unhandled trie error in Trie.Delete", "err", err)
} }
} }