diff options
author | Péter Szilágyi <peterke@gmail.com> | 2016-10-31 19:55:12 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2016-10-31 20:19:14 +0800 |
commit | 90b16a3e85d82241f4505a7db0f95c2f312642a6 (patch) | |
tree | 9b8e11b1127bf96e19599a1f610684bb9d67d06f /core/state | |
parent | b8dec948d4d7d8257e63aeecf982c25aeec9a180 (diff) | |
download | dexon-90b16a3e85d82241f4505a7db0f95c2f312642a6.tar dexon-90b16a3e85d82241f4505a7db0f95c2f312642a6.tar.gz dexon-90b16a3e85d82241f4505a7db0f95c2f312642a6.tar.bz2 dexon-90b16a3e85d82241f4505a7db0f95c2f312642a6.tar.lz dexon-90b16a3e85d82241f4505a7db0f95c2f312642a6.tar.xz dexon-90b16a3e85d82241f4505a7db0f95c2f312642a6.tar.zst dexon-90b16a3e85d82241f4505a7db0f95c2f312642a6.zip |
core/state, eth/downloader, trie: reset fast-failure on progress
Diffstat (limited to 'core/state')
-rw-r--r-- | core/state/sync.go | 6 | ||||
-rw-r--r-- | core/state/sync_test.go | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/core/state/sync.go b/core/state/sync.go index ef2b4b84c..bab9c8e7e 100644 --- a/core/state/sync.go +++ b/core/state/sync.go @@ -59,8 +59,10 @@ func (s *StateSync) Missing(max int) []common.Hash { return (*trie.TrieSync)(s).Missing(max) } -// Process injects a batch of retrieved trie nodes data. -func (s *StateSync) Process(list []trie.SyncResult) (int, error) { +// Process injects a batch of retrieved trie nodes data, returning if something +// was committed to the database and also the index of an entry if processing of +// it failed. +func (s *StateSync) Process(list []trie.SyncResult) (bool, int, error) { return (*trie.TrieSync)(s).Process(list) } diff --git a/core/state/sync_test.go b/core/state/sync_test.go index 949df7301..f5390d80f 100644 --- a/core/state/sync_test.go +++ b/core/state/sync_test.go @@ -138,7 +138,7 @@ func testIterativeStateSync(t *testing.T, batch int) { } results[i] = trie.SyncResult{Hash: hash, Data: data} } - if index, err := sched.Process(results); err != nil { + if _, index, err := sched.Process(results); err != nil { t.Fatalf("failed to process result #%d: %v", index, err) } queue = append(queue[:0], sched.Missing(batch)...) @@ -168,7 +168,7 @@ func TestIterativeDelayedStateSync(t *testing.T) { } results[i] = trie.SyncResult{Hash: hash, Data: data} } - if index, err := sched.Process(results); err != nil { + if _, index, err := sched.Process(results); err != nil { t.Fatalf("failed to process result #%d: %v", index, err) } queue = append(queue[len(results):], sched.Missing(0)...) @@ -206,7 +206,7 @@ func testIterativeRandomStateSync(t *testing.T, batch int) { results = append(results, trie.SyncResult{Hash: hash, Data: data}) } // Feed the retrieved results back and queue new tasks - if index, err := sched.Process(results); err != nil { + if _, index, err := sched.Process(results); err != nil { t.Fatalf("failed to process result #%d: %v", index, err) } queue = make(map[common.Hash]struct{}) @@ -249,7 +249,7 @@ func TestIterativeRandomDelayedStateSync(t *testing.T) { } } // Feed the retrieved results back and queue new tasks - if index, err := sched.Process(results); err != nil { + if _, index, err := sched.Process(results); err != nil { t.Fatalf("failed to process result #%d: %v", index, err) } for _, hash := range sched.Missing(0) { @@ -283,7 +283,7 @@ func TestIncompleteStateSync(t *testing.T) { results[i] = trie.SyncResult{Hash: hash, Data: data} } // Process each of the state nodes - if index, err := sched.Process(results); err != nil { + if _, index, err := sched.Process(results); err != nil { t.Fatalf("failed to process result #%d: %v", index, err) } for _, result := range results { |