From 77cfb2c32866222a4b92ba864ec76a9119aece53 Mon Sep 17 00:00:00 2001 From: Francisco Gindre Date: Fri, 7 Feb 2020 18:04:21 -0300 Subject: [PATCH] Enhancements from PR --- ZcashLightClientKit/Block/Processor/CompactBlockProcessor.swift | 2 +- ZcashLightClientKitTests/CompactBlockProcessorTests.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ZcashLightClientKit/Block/Processor/CompactBlockProcessor.swift b/ZcashLightClientKit/Block/Processor/CompactBlockProcessor.swift index 2826c9ad..f7faf6b4 100644 --- a/ZcashLightClientKit/Block/Processor/CompactBlockProcessor.swift +++ b/ZcashLightClientKit/Block/Processor/CompactBlockProcessor.swift @@ -344,7 +344,7 @@ public class CompactBlockProcessor { func determineLowerBound(errorHeight: Int, consecutiveErrors: Int, walletBirthday: BlockHeight) -> BlockHeight { let offset = min(ZcashSDK.MAX_REORG_SIZE, ZcashSDK.DEFAULT_REWIND_DISTANCE * (consecutiveErrors + 1)) - return max(errorHeight - offset, walletBirthday) + return max(errorHeight - offset, walletBirthday - ZcashSDK.MAX_REORG_SIZE) } private func processBatchFinished(range: CompactBlockRange) { diff --git a/ZcashLightClientKitTests/CompactBlockProcessorTests.swift b/ZcashLightClientKitTests/CompactBlockProcessorTests.swift index a7d8bb4f..4c8ee5b1 100644 --- a/ZcashLightClientKitTests/CompactBlockProcessorTests.swift +++ b/ZcashLightClientKitTests/CompactBlockProcessorTests.swift @@ -141,7 +141,7 @@ class CompactBlockProcessorTests: XCTestCase { let walletBirthday = 781_900 let result = processor.determineLowerBound(errorHeight: errorHeight, consecutiveErrors: 1, walletBirthday: walletBirthday) - let expected = 781_900 + let expected = 781_886 XCTAssertEqual(result, expected)