Merge pull request #834 from nervosnetwork/fix-check-range

fix: not throw when push check range
nervosnetwork · Aug 6, 2019 · 5b20d64 · 5b20d64
2 parents edc5421 + e2e6c90
commit 5b20d64
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/neuron-wallet/src/services/sync/get-blocks.ts b/packages/neuron-wallet/src/services/sync/get-blocks.ts
@@ -24,7 +24,6 @@ export default class GetBlocks {
     this.retryInterval = retryInterval
   }
 
-  // TODO: if retryGetBlock() failed, this will also failed
   public getRangeBlocks = async (blockNumbers: string[]): Promise<Block[]> => {
     const blocks: Block[] = await Promise.all(
       blockNumbers.map(async num => {
@@ -42,7 +41,6 @@ export default class GetBlocks {
     })
   }
 
-  // TODO: if get any error after retry, should pause queue
   public retryGetBlock = async (num: string): Promise<Block> => {
     const block: Block = await Utils.retry(this.retryTime, this.retryInterval, async () => {
       const b: Block = await GetBlocks.getBlockByNumber(num)

diff --git a/packages/neuron-wallet/src/services/sync/range-for-check.ts b/packages/neuron-wallet/src/services/sync/range-for-check.ts
@@ -47,11 +47,15 @@ export default class RangeForCheck {
       const lastBlockHeader = this.range[this.range.length - 1]
       const firstBlockHeader = range[0]
       if (lastBlockHeader.hash !== firstBlockHeader.parentHash) {
-        // TODO: should re generate range here, should ensure currentBlockNumber before
-        throw new Error('not match')
+        this.clearRange()
+        return
       }
     }
-    this.range = this.range.slice(range.length).concat(range)
+    if (this.range.length >= this.checkSize) {
+      this.range = this.range.slice(range.length).concat(range)
+    } else {
+      this.range = this.range.concat(range)
+    }
   }
 
   public check = (blockHeaders: BlockHeader[]) => {