From 97d78f646f2ccaa1c068b3871091b90b4a2f5c12 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sat, 12 Oct 2024 11:23:25 -0500 Subject: [PATCH] chore: rename some services to clients --- .../Service/BDK Service/BDKService.swift | 28 +++++++++---------- .../View Model/Settings/SeedViewModel.swift | 8 +++--- .../View/Settings/SeedView.swift | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift b/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift index 2dc5d49a..1304131f 100644 --- a/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift +++ b/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift @@ -14,21 +14,21 @@ private class BDKService { private var balance: Balance? private var connection: Connection? private let esploraClient: EsploraClient - private let keyService: KeyClient + private let keyClient: KeyClient private var needsFullScan: Bool = false var network: Network private var wallet: Wallet? init( - keyService: KeyClient = .live + keyClient: KeyClient = .live ) { - let storedNetworkString = try! keyService.getNetwork() ?? Network.signet.description + let storedNetworkString = try! keyClient.getNetwork() ?? Network.signet.description let storedEsploraURL = - try! keyService.getEsploraURL() + try! keyClient.getEsploraURL() ?? Constants.Config.EsploraServerURLNetwork.Signet.mutiny self.network = Network(stringValue: storedNetworkString) ?? .signet - self.keyService = keyService + self.keyClient = keyClient self.esploraClient = EsploraClient(url: storedEsploraURL) } @@ -79,7 +79,7 @@ private class BDKService { } let baseUrl = - try keyService.getEsploraURL() ?? Constants.Config.EsploraServerURLNetwork.Signet.mutiny + try keyClient.getEsploraURL() ?? Constants.Config.EsploraServerURLNetwork.Signet.mutiny var words12: String if let words = words, !words.isEmpty { @@ -112,9 +112,9 @@ private class BDKService { changeDescriptor: changeDescriptor.toStringWithSecret() ) - try keyService.saveBackupInfo(backupInfo) - try keyService.saveNetwork(self.network.description) - try keyService.saveEsploraURL(baseUrl) + try keyClient.saveBackupInfo(backupInfo) + try keyClient.saveNetwork(self.network.description) + try keyClient.saveEsploraURL(baseUrl) try FileManager.default.ensureDirectoryExists(at: walletDataDirectoryURL) try FileManager.default.removeOldFlatFileIfNeeded(at: documentsDirectoryURL) @@ -149,7 +149,7 @@ private class BDKService { } func loadWalletFromBackup() throws { - let backupInfo = try keyService.getBackupInfo() + let backupInfo = try keyClient.getBackupInfo() let descriptor = try Descriptor(descriptor: backupInfo.descriptor, network: self.network) let changeDescriptor = try Descriptor( descriptor: backupInfo.changeDescriptor, @@ -162,9 +162,9 @@ private class BDKService { if let bundleID = Bundle.main.bundleIdentifier { UserDefaults.standard.removePersistentDomain(forName: bundleID) } - try self.keyService.deleteBackupInfo() - try self.keyService.deleteEsplora() - try self.keyService.deleteNetwork() + try self.keyClient.deleteBackupInfo() + try self.keyClient.deleteEsplora() + try self.keyClient.deleteNetwork() let documentsDirectoryURL = URL.documentsDirectory let walletDataDirectoryURL = documentsDirectoryURL.appendingPathComponent("wallet_data") @@ -177,7 +177,7 @@ private class BDKService { } func getBackupInfo() throws -> BackupInfo { - let backupInfo = try keyService.getBackupInfo() + let backupInfo = try keyClient.getBackupInfo() return backupInfo } diff --git a/BDKSwiftExampleWallet/View Model/Settings/SeedViewModel.swift b/BDKSwiftExampleWallet/View Model/Settings/SeedViewModel.swift index 94c6c29e..b510b8cd 100644 --- a/BDKSwiftExampleWallet/View Model/Settings/SeedViewModel.swift +++ b/BDKSwiftExampleWallet/View Model/Settings/SeedViewModel.swift @@ -12,19 +12,19 @@ import SwiftUI @Observable @MainActor class SeedViewModel { - let bdkService: BDKClient + let bdkClient: BDKClient var seed: BackupInfo? var seedViewError: AppError? var showingSeedViewErrorAlert: Bool init( - bdkService: BDKClient = .live, + bdkClient: BDKClient = .live, seed: BackupInfo? = nil, seedViewError: AppError? = nil, showingSeedViewErrorAlert: Bool = false ) { - self.bdkService = bdkService + self.bdkClient = bdkClient self.seed = seed self.seedViewError = seedViewError self.showingSeedViewErrorAlert = showingSeedViewErrorAlert @@ -32,7 +32,7 @@ class SeedViewModel { func getSeed() { do { - let seed = try bdkService.getBackupInfo() + let seed = try bdkClient.getBackupInfo() self.seed = seed } catch { self.seedViewError = .generic(message: error.localizedDescription) diff --git a/BDKSwiftExampleWallet/View/Settings/SeedView.swift b/BDKSwiftExampleWallet/View/Settings/SeedView.swift index d85eb8cc..b08a9a66 100644 --- a/BDKSwiftExampleWallet/View/Settings/SeedView.swift +++ b/BDKSwiftExampleWallet/View/Settings/SeedView.swift @@ -97,6 +97,6 @@ struct SeedView: View { #if DEBUG #Preview { - SeedView(viewModel: .init(bdkService: .mock)) + SeedView(viewModel: .init(bdkClient: .mock)) } #endif