refactor: move peer connect logic to WalletViewModel.kt

Author: jvsena42

app/src/main/java/to/bitkit/repositories/LightningRepo.kt

@@ -51,7 +51,6 @@ import to.bitkit.di.BgDispatcher
 import to.bitkit.env.Env
 import to.bitkit.ext.getSatsPerVByteFor
 import to.bitkit.ext.nowTimestamp
-import to.bitkit.ext.of
 import to.bitkit.ext.toPeerDetailsList
 import to.bitkit.models.CoinSelectionPreference
 import to.bitkit.models.NodeLifecycleState
@@ -65,7 +64,6 @@ import to.bitkit.services.LnurlChannelResponse
 import to.bitkit.services.LnurlService
 import to.bitkit.services.LnurlWithdrawResponse
 import to.bitkit.services.LspNotificationsService
-import to.bitkit.services.MigrationService
 import to.bitkit.services.NodeEventHandler
 import to.bitkit.utils.AppError
 import to.bitkit.utils.Logger
@@ -75,7 +73,6 @@ import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicReference
 import javax.inject.Inject
-import javax.inject.Provider
 import javax.inject.Singleton
 import kotlin.coroutines.cancellation.CancellationException
 import kotlin.time.Duration
@@ -97,7 +94,6 @@ class LightningRepo @Inject constructor(
     private val preActivityMetadataRepo: PreActivityMetadataRepo,
     private val connectivityRepo: ConnectivityRepo,
     private val vssBackupClientLdk: VssBackupClientLdk,
-    private val migrationServiceProvider: Provider<MigrationService>,
 ) {
     private val _lightningState = MutableStateFlow(LightningState())
     val lightningState = _lightningState.asStateFlow()
@@ -352,7 +348,6 @@ class LightningRepo @Inject constructor(
                 connectToTrustedPeers().onFailure {
                     Logger.error("Failed to connect to trusted peers", it, context = TAG)
                 }
-                connectMigrationPeers()
 
                 sync().onFailure { e ->
                     Logger.warn("Initial sync failed, event-driven sync will retry", e, context = TAG)
@@ -671,18 +666,6 @@ class LightningRepo @Inject constructor(
         runCatching { lightningService.connectToTrustedPeers() }
     }
 
-    private suspend fun connectMigrationPeers() {
-        val peerUris = migrationServiceProvider.get().tryFetchMigrationPeersFromBackup()
-        for (uri in peerUris) {
-            runCatching {
-                val peer = PeerDetails.of(uri)
-                lightningService.connectPeer(peer)
-            }.onFailure {
-                Logger.error("Failed to connect migration peer: $uri", it, context = TAG)
-            }
-        }
-    }
-
     suspend fun connectPeer(peer: PeerDetails): Result<Unit> = executeWhenNodeRunning("connectPeer") {
         lightningService.connectPeer(peer).map {
             syncState()

app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt

@@ -26,6 +26,7 @@ import org.lightningdevkit.ldknode.PeerDetails
 import to.bitkit.R
 import to.bitkit.data.SettingsStore
 import to.bitkit.di.BgDispatcher
+import to.bitkit.ext.of
 import to.bitkit.models.Toast
 import to.bitkit.repositories.BackupRepo
 import to.bitkit.repositories.BlocktankRepo
@@ -291,6 +292,7 @@ class WalletViewModel @Inject constructor(
                     migrationService.consumePendingChannelMigration()
                 }
                 walletRepo.setWalletExistsState()
+                connectMigrationPeers()
                 walletRepo.syncBalances()
                 if (_restoreState.value.isIdle()) {
                     walletRepo.refreshBip21()
@@ -304,6 +306,18 @@ class WalletViewModel @Inject constructor(
             }
     }
 
+    private suspend fun connectMigrationPeers() {
+        val peerUris = migrationService.tryFetchMigrationPeersFromBackup()
+        for (uri in peerUris) {
+            runCatching {
+                val peer = PeerDetails.of(uri)
+                lightningRepo.connectPeer(peer)
+            }.onFailure {
+                Logger.error("Failed to connect migration peer: $uri", it, context = TAG)
+            }
+        }
+    }
+
     fun stop() {
         if (!walletExists) return
 

app/src/test/java/to/bitkit/repositories/LightningRepoTest.kt

@@ -46,7 +46,6 @@ import to.bitkit.services.CoreService
 import to.bitkit.services.LightningService
 import to.bitkit.services.LnurlService
 import to.bitkit.services.LspNotificationsService
-import to.bitkit.services.MigrationService
 import to.bitkit.test.BaseUnitTest
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
@@ -68,7 +67,6 @@ class LightningRepoTest : BaseUnitTest() {
     private val lnurlService = mock<LnurlService>()
     private val connectivityRepo = mock<ConnectivityRepo>()
     private val vssBackupClientLdk = mock<VssBackupClientLdk>()
-    private val migrationService = mock<MigrationService>()
 
     @Before
     fun setUp() = runBlocking {
@@ -78,7 +76,6 @@ class LightningRepoTest : BaseUnitTest() {
         whenever(connectivityRepo.isOnline).thenReturn(MutableStateFlow(ConnectivityState.CONNECTED))
         whenever(settingsStore.data).thenReturn(flowOf(SettingsData()))
         whenever(lightningService.aresRequiredPeersInNetworkGraph()).thenReturn(true)
-        whenever(migrationService.tryFetchMigrationPeersFromBackup()).thenReturn(emptyList())
         sut = LightningRepo(
             bgDispatcher = testDispatcher,
             lightningService = lightningService,
@@ -92,7 +89,6 @@ class LightningRepoTest : BaseUnitTest() {
             preActivityMetadataRepo = preActivityMetadataRepo,
             connectivityRepo = connectivityRepo,
             vssBackupClientLdk = vssBackupClientLdk,
-            migrationServiceProvider = { migrationService },
         )
     }
 

app/src/test/java/to/bitkit/ui/WalletViewModelTest.kt

@@ -57,6 +57,7 @@ class WalletViewModelTest : BaseUnitTest() {
         whenever(walletRepo.walletState).thenReturn(walletState)
         whenever(lightningRepo.lightningState).thenReturn(lightningState)
         whenever(migrationService.isMigrationChecked()).thenReturn(true)
+        whenever(migrationService.tryFetchMigrationPeersFromBackup()).thenReturn(emptyList())
         whenever(connectivityRepo.isOnline).thenReturn(isOnline)
 
         sut = WalletViewModel(