Merge remote-tracking branch 'origin/hotfix-37.2'

horizontalsystems · Jan 22, 2024 · b455b3a · b455b3a
2 parents 4956962 + 662d6dc
commit b455b3a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
diff --git a/...rc/main/kotlin/io/horizontalsystems/bitcoincore/apisync/blockchair/BlockchairApiSyncer.kt b/...rc/main/kotlin/io/horizontalsystems/bitcoincore/apisync/blockchair/BlockchairApiSyncer.kt
@@ -46,17 +46,6 @@ class BlockchairApiSyncer(
             }
     }
 
-    override fun syncLastBlock() {
-        syncLastBlockSingle()
-            .subscribeOn(Schedulers.io())
-            .observeOn(Schedulers.io())
-            .subscribe({}, {
-                handleError(it)
-            }).let {
-                disposables.add(it)
-            }
-    }
-
     override fun terminate() {
         disposables.clear()
     }
@@ -66,7 +55,7 @@ class BlockchairApiSyncer(
         listener?.onSyncFailed(error)
     }
 
-    private fun syncLastBlockSingle(): Single<Unit> = Single.create {
+    private fun fetchLastBlock() {
         val blockHeaderItem = lastBlockProvider.lastBlockHeader()
         val header = BlockHeader(
             version = 0,
@@ -85,6 +74,7 @@ class BlockchairApiSyncer(
         val allKeys = storage.getPublicKeys()
         val stopHeight = storage.downloadedTransactionsBestBlockHeight()
         fetchRecursive(allKeys, allKeys, stopHeight)
+        fetchLastBlock()
 
         apiSyncStateManager.restored = true
         listener?.onSyncSuccess()

diff --git a/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/apisync/legacy/ApiSyncer.kt b/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/apisync/legacy/ApiSyncer.kt
@@ -48,8 +48,6 @@ class ApiSyncer(
         disposables.add(disposable)
     }
 
-    override fun syncLastBlock() {}
-
     private fun handle(keys: List<PublicKey>, blockHashes: List<BlockHash>) {
         publicKeyManager.addKeys(keys)
 

diff --git a/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/core/Interfaces.kt b/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/core/Interfaces.kt
@@ -222,7 +222,6 @@ interface IApiSyncer {
     val willSync: Boolean
 
     fun sync()
-    fun syncLastBlock()
     fun terminate()
 }
 

diff --git a/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/SyncManager.kt b/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/SyncManager.kt
@@ -169,7 +169,6 @@ class SyncManager(
         val forceAddedBlocks = forceAddedBlocksTotal - storage.getApiBlockHashesCount()
         syncState = when {
             forceAddedBlocks >= forceAddedBlocksTotal -> {
-                apiSyncer.syncLastBlock()
                 KitState.Synced
             }