test(fixes): remove hard dependency on CommonWallet in tests\n\n- Replace CommonWallet-based mocks with app-local WalletCommand* types\n- Update WalletSelectAccountCommandTests to use WalletPresentationCommand\n- Wrap CommonWallet imports in #if canImport(CommonWallet) guards (WestendStub, CrowdloanContributionConfirmTests, ModuleMocks, etc.)\n- Drop unnecessary CommonWallet import in StubBalanceViewModelFactory

Signed-off-by: William Richter <[email protected]>

Author: WRRicht3r

fearlessTests/Helper/WestendStub.swift

@@ -2,7 +2,9 @@ import Foundation
 @testable import fearless
 import BigInt
 import IrohaCrypto
+#if canImport(CommonWallet)
 import CommonWallet
+#endif
 import SSFModels
 
 struct WestendStub {

fearlessTests/Mocks/ModuleMocks.swift

@@ -13720,7 +13720,9 @@ import Cuckoo
 @testable import fearless
 
 import BigInt
+#if canImport(CommonWallet)
 import CommonWallet
+#endif
 import Foundation
 import SoraFoundation
 
@@ -47232,7 +47234,9 @@ import Cuckoo
 @testable import fearless
 
 import BigInt
+#if canImport(CommonWallet)
 import CommonWallet
+#endif
 import SoraFoundation
 
 
@@ -48688,7 +48692,9 @@ import Cuckoo
 @testable import fearless
 
 import BigInt
+#if canImport(CommonWallet)
 import CommonWallet
+#endif
 import SoraFoundation
 
 
@@ -50297,7 +50303,9 @@ import Cuckoo
 @testable import fearless
 
 import BigInt
+#if canImport(CommonWallet)
 import CommonWallet
+#endif
 import Foundation
 import SoraFoundation
 
@@ -58364,7 +58372,9 @@ import SoraFoundation
 import Cuckoo
 @testable import fearless
 
+#if canImport(CommonWallet)
 import CommonWallet
+#endif
 import Foundation
 import SoraFoundation
 
@@ -69203,7 +69213,9 @@ import Cuckoo
 @testable import fearless
 
 import BigInt
+#if canImport(CommonWallet)
 import CommonWallet
+#endif
 import Foundation
 import SoraFoundation
 
@@ -72816,7 +72828,9 @@ import SoraFoundation
 import Cuckoo
 @testable import fearless
 
+#if canImport(CommonWallet)
 import CommonWallet
+#endif
 
 
 
@@ -73462,4 +73476,3 @@ import CommonWallet
 
 
 
-

fearlessTests/Mocks/ViewModel/StubBalanceViewModelFactory.swift

@@ -1,6 +1,5 @@
 import Foundation
 import SoraFoundation
-import CommonWallet
 @testable import fearless
 
 struct StubBalanceViewModelFactory: BalanceViewModelFactoryProtocol {

fearlessTests/Mocks/WalletCommandFactoryProtocolMock.swift

@@ -1,126 +1,27 @@
 import Foundation
-import CommonWallet
+import UIKit
+@testable import fearless
 
 class WalletCommandProtocolMock: WalletCommandProtocol {
     func execute() throws {}
 }
-
-class WalletPresentationCommandProtocolMock: WalletCommandProtocolMock, WalletPresentationCommandProtocol {
-    var presentationStyle: WalletPresentationStyle = .push(hidesBottomBar: true)
-    var animated: Bool = false
-    var completionBlock: (() -> Void)?
-}
-
-class AssetDetailsCommandProtocolMock: WalletPresentationCommandProtocolMock, AssetDetailsCommadProtocol {
-    var ignoredWhenSingleAsset: Bool = false
-}
-
-class WalletHideCommandProtocolMock: WalletCommandProtocolMock, WalletHideCommandProtocol {
-    var actionType: WalletHideActionType = .dismiss
-    var animated: Bool = false
-    var completionBlock: (() -> Void)?
-}
-
 final class WalletCommandFactoryProtocolMock: WalletCommandFactoryProtocol {
-    var sendClosure: ((String?) -> WalletPresentationCommandProtocol)?
-    var receiverClosure: ((String?) -> WalletPresentationCommandProtocol)?
-    var assetDetailsClosure: ((String) -> AssetDetailsCommadProtocol)?
-    var scanReceiverClosure: (() -> WalletPresentationCommandProtocol)?
-    var withdrawClosure: ((String, String) -> WalletPresentationCommandProtocol)?
-    var presentationClosure: ((UIViewController) -> WalletPresentationCommandProtocol)?
-    var hideClosure: ((WalletHideActionType) -> WalletHideCommandProtocol)?
-    var accountUpdateClosure: (() -> WalletCommandProtocol)?
-    var languageUpdateClosure: ((WalletLanguage) -> WalletCommandProtocol)?
-    var transactionClosure: ((AssetTransactionData) -> WalletPresentationCommandProtocol)?
-    var transferClosure: ((TransferPayload) -> WalletPresentationCommandProtocol)?
-
-    func prepareSendCommand(for assetId: String?) -> WalletPresentationCommandProtocol {
-        if let closure = sendClosure {
-            return closure(assetId)
-        } else {
-            return WalletPresentationCommandProtocolMock()
-        }
-    }
+    var presentationClosure: ((UIViewController) -> WalletPresentationCommand)?
+    var hideClosure: ((WalletDismissAction) -> WalletPresentationCommand)?
 
-    func prepareReceiveCommand(for assetId: String?) -> WalletPresentationCommandProtocol {
-        if let closure = receiverClosure {
-            return closure(assetId)
-        } else {
-            return WalletPresentationCommandProtocolMock()
-        }
-    }
-
-    func prepareAssetDetailsCommand(for assetId: String) -> AssetDetailsCommadProtocol {
-        if let closure = assetDetailsClosure {
-            return closure(assetId)
-        } else {
-            return AssetDetailsCommandProtocolMock()
-        }
-    }
-
-    func prepareScanReceiverCommand() -> WalletPresentationCommandProtocol {
-        if let closure = scanReceiverClosure {
-            return closure()
-        } else {
-            return WalletPresentationCommandProtocolMock()
-        }
-    }
-
-    func prepareWithdrawCommand(for assetId: String, optionId: String)
-        -> WalletPresentationCommandProtocol {
-        if let closure = withdrawClosure {
-            return closure(assetId, optionId)
-        } else {
-            return WalletPresentationCommandProtocolMock()
-        }
-    }
-
-    func preparePresentationCommand(for controller: UIViewController)
-        -> WalletPresentationCommandProtocol {
+    func preparePresentationCommand(for controller: UIViewController) -> WalletPresentationCommand {
         if let closure = presentationClosure {
             return closure(controller)
         } else {
-            return WalletPresentationCommandProtocolMock()
+            return WalletPresentationCommand(presentingController: controller)
         }
     }
 
-    func prepareHideCommand(with actionType: WalletHideActionType) -> WalletHideCommandProtocol {
+    func prepareHideCommand(with action: WalletDismissAction) -> WalletPresentationCommand {
         if let closure = hideClosure {
-            return closure(actionType)
-        } else {
-            return WalletHideCommandProtocolMock()
-        }
-    }
-
-    func prepareAccountUpdateCommand() -> WalletCommandProtocol {
-        if let closure = accountUpdateClosure {
-            return closure()
-        } else {
-            return WalletCommandProtocolMock()
-        }
-    }
-
-    func prepareLanguageSwitchCommand(with newLanguage: WalletLanguage) -> WalletCommandProtocol {
-        if let closure = languageUpdateClosure {
-            return closure(newLanguage)
-        } else {
-            return WalletCommandProtocolMock()
-        }
-    }
-
-    func prepareTransactionDetailsCommand(with transaction: AssetTransactionData) -> WalletPresentationCommandProtocol {
-        if let closure = transactionClosure {
-            return closure(transaction)
-        } else {
-            return WalletPresentationCommandProtocolMock()
-        }
-    }
-
-    func prepareTransfer(with payload: TransferPayload) -> WalletPresentationCommandProtocol {
-        if let closure = transferClosure {
-            return closure(payload)
+            return closure(action)
         } else {
-             return WalletPresentationCommandProtocolMock()
+            return WalletPresentationCommand()
         }
     }
 }

fearlessTests/Modules/Crowdloan/CrowdloanContributionConfirm/CrowdloanContributionConfirmTests.swift

@@ -1,7 +1,9 @@
 import XCTest
 @testable import fearless
 import SoraKeystore
+#if canImport(CommonWallet)
 import CommonWallet
+#endif
 import RobinHood
 import SoraFoundation
 import SSFUtils

fearlessTests/Modules/Wallet/Commands/WalletSelectAccountCommandTests.swift

@@ -20,7 +20,7 @@ class WalletSelectAccountCommandTests: XCTestCase {
         commandFactory.presentationClosure = { _ in
             completionExpectation.fulfill()
 
-            return WalletPresentationCommandProtocolMock()
+            return WalletPresentationCommand()
         }
 
         try command.execute()