From 5808c505780d7a4584805768ca8b178b339a0f58 Mon Sep 17 00:00:00 2001 From: Francisco Gindre Date: Wed, 9 Jun 2021 19:39:32 -0300 Subject: [PATCH] fix progress being > 1 --- .../Block/Processor/CompactBlockProcessor.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ZcashLightClientKit/Block/Processor/CompactBlockProcessor.swift b/ZcashLightClientKit/Block/Processor/CompactBlockProcessor.swift index 09284aa7..6c78a742 100644 --- a/ZcashLightClientKit/Block/Processor/CompactBlockProcessor.swift +++ b/ZcashLightClientKit/Block/Processor/CompactBlockProcessor.swift @@ -694,7 +694,7 @@ public class CompactBlockProcessor { self?.state = .validating } - let scanBlocksOperation = CompactBlockBatchScanningOperation(rustWelding: rustBackend, cacheDb: config.cacheDb, dataDb: config.dataDb, transactionRepository: transactionRepository, range: range, batchSize: 1000, progressDelegate: self) + let scanBlocksOperation = CompactBlockBatchScanningOperation(rustWelding: rustBackend, cacheDb: config.cacheDb, dataDb: config.dataDb, transactionRepository: transactionRepository, range: range, progressDelegate: self) let validateScanningAdapterOperation = BlockOperation { [weak scanBlocksOperation, weak validateChainOperation] in scanBlocksOperation?.error = validateChainOperation?.error @@ -1249,6 +1249,8 @@ extension CompactBlockProcessor: EnhancementStreamDelegate { } public extension BlockProgressReporting { var progress: Float { - Float((self.progressHeight - self.startHeight)) / Float((self.targetHeight - self.startHeight)) * 100.0 + let overall = self.targetHeight - self.startHeight + + return overall > 0 ? Float((self.progressHeight - self.startHeight)) / Float(overall) : 0 } }