fix: early return when first-not-match

classicalliu · classicalliu · commit 08a708e60d2e · 2019-08-07T12:41:01.000+08:00
diff --git a/packages/neuron-wallet/src/services/sync/queue.ts b/packages/neuron-wallet/src/services/sync/queue.ts
@@ -73,7 +73,11 @@ export default class Queue {
     const blockHeaders: BlockHeader[] = blocks.map(block => block.header)
 
     // 2. check blockHeaders
-    await this.checkBlockHeader(blockHeaders)
+    const checkResult = await this.checkBlockHeader(blockHeaders)
+
+    if (checkResult.type === 'first-not-match') {
+      return
+    }
 
     // 3. check and save
     await this.getBlocksService.checkAndSave(blocks, this.lockHashes)
@@ -103,6 +107,8 @@ export default class Queue {
         throw new Error('chain forked')
       }
     }
+
+    return checkResult
   }
 
   public push = (blockNumbers: string[]): void => {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,11 @@ export default class Queue {`
`73`	`73`	`const blockHeaders: BlockHeader[] = blocks.map(block => block.header)`
`74`	`74`
`75`	`75`	`// 2. check blockHeaders`
`76`		`- await this.checkBlockHeader(blockHeaders)`
	`76`	`+ const checkResult = await this.checkBlockHeader(blockHeaders)`
	`77`	`+`
	`78`	`+ if (checkResult.type === 'first-not-match') {`
	`79`	`+ return`
	`80`	`+ }`
`77`	`81`
`78`	`82`	`// 3. check and save`
`79`	`83`	`await this.getBlocksService.checkAndSave(blocks, this.lockHashes)`
`@@ -103,6 +107,8 @@ export default class Queue {`
`103`	`107`	`throw new Error('chain forked')`
`104`	`108`	`}`
`105`	`109`	`}`
	`110`	`+`
	`111`	`+ return checkResult`
`106`	`112`	`}`
`107`	`113`
`108`	`114`	`public push = (blockNumbers: string[]): void => {`