refactor: encapsulate wallet init logic

Author: ovitrif

app/src/main/java/to/bitkit/ui/MainActivity.kt

@@ -242,8 +242,6 @@ private fun OnboardingNav(
                     scope.launch {
                         runCatching {
                             appViewModel.resetIsAuthenticatedState()
-                            walletViewModel.setInitNodeLifecycleState()
-                            walletViewModel.setRestoringWalletState()
                             walletViewModel.restoreWallet(mnemonic, passphrase)
                         }.onFailure {
                             appViewModel.toast(it)
@@ -259,7 +257,6 @@ private fun OnboardingNav(
                     scope.launch {
                         runCatching {
                             appViewModel.resetIsAuthenticatedState()
-                            walletViewModel.setInitNodeLifecycleState()
                             walletViewModel.createWallet(bip39Passphrase = passphrase)
                         }.onFailure {
                             appViewModel.toast(it)

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

@@ -118,9 +118,6 @@ class WalletViewModel @Inject constructor(
         restoreState = RestoreState.BackupRestoreCompleted
     }
 
-    fun setRestoringWalletState() {
-        restoreState = RestoreState.RestoringWallet
-    }
 
     fun onRestoreContinue() {
         restoreState = RestoreState.NotRestoring
@@ -136,9 +133,7 @@ class WalletViewModel @Inject constructor(
         }
     }
 
-    fun setInitNodeLifecycleState() {
-        lightningRepo.setInitNodeLifecycleState()
-    }
+    fun setInitNodeLifecycleState() = lightningRepo.setInitNodeLifecycleState()
 
     fun start(walletIndex: Int = 0) {
         if (!walletExists) return
@@ -245,6 +240,7 @@ class WalletViewModel @Inject constructor(
     }
 
     suspend fun createWallet(bip39Passphrase: String?) {
+        setInitNodeLifecycleState()
         walletRepo.createWallet(bip39Passphrase)
             .onSuccess {
                 backupRepo.scheduleFullBackup()
@@ -255,9 +251,12 @@ class WalletViewModel @Inject constructor(
     }
 
     suspend fun restoreWallet(mnemonic: String, bip39Passphrase: String?) {
+        setInitNodeLifecycleState()
+        restoreState = RestoreState.RestoringWallet
+
         walletRepo.restoreWallet(
             mnemonic = mnemonic,
-            bip39Passphrase = bip39Passphrase
+            bip39Passphrase = bip39Passphrase,
         ).onFailure { error ->
             ToastEventBus.send(error)
         }

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

@@ -82,57 +82,58 @@ class WalletViewModelTest : BaseUnitTest() {
     }
 
     @Test
-    fun `disconnectPeer should call lightningRepo disconnectPeer and send success toast`() = test {
+    fun `disconnectPeer should call lightningRepo disconnectPeer`() = test {
         val testPeer = PeerDetails.from("nodeId", "host", "9735")
-        whenever(lightningRepo.disconnectPeer(testPeer)).thenReturn(Result.success(Unit))
+        val testError = Exception("Test error")
+        whenever(lightningRepo.disconnectPeer(testPeer)).thenReturn(Result.failure(testError))
 
         sut.disconnectPeer(testPeer)
 
         verify(lightningRepo).disconnectPeer(testPeer)
-        // Add verification for ToastEventBus.send if you have a way to capture those events
     }
 
     @Test
-    fun `disconnectPeer should call lightningRepo disconnectPeer and send failure toast`() = test {
-        val testPeer = PeerDetails.from("nodeId", "host", "9735")
-        val testError = Exception("Test error")
-        whenever(lightningRepo.disconnectPeer(testPeer)).thenReturn(Result.failure(testError))
-
-        sut.disconnectPeer(testPeer)
+    fun `wipeWallet should call walletRepo wipeWallet`() = test {
+        whenever(walletRepo.wipeWallet(walletIndex = 0)).thenReturn(Result.success(Unit))
+        sut.wipeWallet()
 
-        verify(lightningRepo).disconnectPeer(testPeer)
-        // Add verification for ToastEventBus.send if you have a way to capture those events
+        verify(walletRepo).wipeWallet(walletIndex = 0)
     }
 
     @Test
-    fun `wipeWallet should call walletRepo wipeWallet`() =
-        test {
-            whenever(walletRepo.wipeWallet(walletIndex = 0)).thenReturn(Result.success(Unit))
-            sut.wipeWallet()
+    fun `createWallet should call walletRepo createWallet`() = test {
+        whenever(walletRepo.createWallet(anyOrNull())).thenReturn(Result.success(Unit))
+
+        sut.createWallet(null)
 
-            verify(walletRepo).wipeWallet(walletIndex = 0)
-        }
+        verify(walletRepo).createWallet(anyOrNull())
+    }
 
     @Test
-    fun `createWallet should call walletRepo createWallet and send failure toast`() = test {
-        val testError = Exception("Test error")
-        whenever(walletRepo.createWallet(anyOrNull())).thenReturn(Result.failure(testError))
+    fun `createWallet should call setInitNodeLifecycleState`() = test {
+        whenever(walletRepo.createWallet(anyOrNull())).thenReturn(Result.success(Unit))
 
         sut.createWallet(null)
 
-        verify(walletRepo).createWallet(anyOrNull())
-        // Add verification for ToastEventBus.send
+        verify(lightningRepo).setInitNodeLifecycleState()
     }
 
     @Test
-    fun `restoreWallet should call walletRepo restoreWallet and send failure toast`() = test {
-        val testError = Exception("Test error")
-        whenever(walletRepo.restoreWallet(any(), anyOrNull())).thenReturn(Result.failure(testError))
+    fun `restoreWallet should call walletRepo restoreWallet`() = test {
+        whenever(walletRepo.restoreWallet(any(), anyOrNull())).thenReturn(Result.success(Unit))
 
         sut.restoreWallet("test_mnemonic", null)
 
         verify(walletRepo).restoreWallet(any(), anyOrNull())
-        // Add verification for ToastEventBus.send
+    }
+
+    @Test
+    fun `restoreWallet should call setInitNodeLifecycleState`() = test {
+        whenever(walletRepo.restoreWallet(any(), anyOrNull())).thenReturn(Result.success(Unit))
+
+        sut.restoreWallet("test_mnemonic", null)
+
+        verify(lightningRepo).setInitNodeLifecycleState()
     }
 
     @Test
@@ -169,7 +170,7 @@ class WalletViewModelTest : BaseUnitTest() {
     fun `onBackupRestoreSuccess should reset restoreState`() = test {
         whenever(backupRepo.performFullRestoreFromLatestBackup()).thenReturn(Result.success(Unit))
         mockWalletState.value = mockWalletState.value.copy(walletExists = true)
-        sut.setRestoringWalletState()
+        sut.restoreWallet("mnemonic", "passphrase")
         assertEquals(RestoreState.RestoringWallet, sut.restoreState)
 
         sut.onRestoreContinue()
@@ -182,7 +183,7 @@ class WalletViewModelTest : BaseUnitTest() {
     fun `proceedWithoutRestore should exit restore flow`() = test {
         val testError = Exception("Test error")
         whenever(backupRepo.performFullRestoreFromLatestBackup()).thenReturn(Result.failure(testError))
-        sut.setRestoringWalletState()
+        sut.restoreWallet("mnemonic", "passphrase")
         mockWalletState.value = mockWalletState.value.copy(walletExists = true)
         assertEquals(RestoreState.BackupRestoreCompleted, sut.restoreState)
 
@@ -196,7 +197,7 @@ class WalletViewModelTest : BaseUnitTest() {
         whenever(backupRepo.performFullRestoreFromLatestBackup()).thenReturn(Result.success(Unit))
         assertEquals(RestoreState.NotRestoring, sut.restoreState)
 
-        sut.setRestoringWalletState()
+        sut.restoreWallet("mnemonic", "passphrase")
         assertEquals(RestoreState.RestoringWallet, sut.restoreState)
 
         mockWalletState.value = mockWalletState.value.copy(walletExists = true)