[trello.com/c/vawidi4o] Fix storeInKVS typo

Lainaaa · Lainaaa · commit 7e531f4c1bbd · 2025-03-28T10:46:15.000+07:00
diff --git a/Adamant/Modules/Wallets/Adamant/AdmWalletService.swift b/Adamant/Modules/Wallets/Adamant/AdmWalletService.swift
@@ -225,7 +225,7 @@ final class AdmWalletService: NSObject, WalletCoreProtocol, WalletStaticCoreProt
         .init(sentDate: nil, status: .notInitiated)
     }
     
-    func initWallet(withPassphrase: String, withPassword: String, storeInKVC: Bool) async throws -> WalletAccount {
+    func initWallet(withPassphrase: String, withPassword: String, storeInKVS: Bool) async throws -> WalletAccount {
         throw InternalAPIError.unknownError
     }
     
diff --git a/Adamant/Modules/Wallets/Bitcoin/BtcWalletService.swift b/Adamant/Modules/Wallets/Bitcoin/BtcWalletService.swift
@@ -445,7 +445,7 @@ extension BtcWalletService {
         btcWallet = nil
     }
     
-    func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {
+    func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVS: Bool) async throws -> WalletAccount {
         guard let adamant = accountService.account else {
             throw WalletServiceError.notLogged
         }
@@ -488,7 +488,7 @@ extension BtcWalletService {
             self.update()
         }
         
-        guard storeInKVC else { return eWallet }
+        guard storeInKVS else { return eWallet }
         
         // MARK: 4. Save address into KVS
         let kvsAddressModel = makeKVSAddressModel(wallet: eWallet)
diff --git a/Adamant/Modules/Wallets/Dash/DashWalletService.swift b/Adamant/Modules/Wallets/Dash/DashWalletService.swift
@@ -300,7 +300,7 @@ extension DashWalletService {
     }
     
     @MainActor
-    func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {
+    func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVS: Bool) async throws -> WalletAccount {
         guard let adamant = accountService.account else {
             throw WalletServiceError.notLogged
         }
@@ -345,7 +345,7 @@ extension DashWalletService {
             self.update()
         }
         
-        guard storeInKVC else { return eWallet }
+        guard storeInKVS else { return eWallet }
         
         // MARK: 4. Save address into KVS
         let kvsAddressModel = makeKVSAddressModel(wallet: eWallet)
diff --git a/Adamant/Modules/Wallets/Doge/DogeWalletService.swift b/Adamant/Modules/Wallets/Doge/DogeWalletService.swift
@@ -319,7 +319,7 @@ extension DogeWalletService {
         dogeWallet = nil
     }
     
-    func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {
+    func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVS: Bool) async throws -> WalletAccount {
         guard let adamant = accountService.account else {
             throw WalletServiceError.notLogged
         }
@@ -363,7 +363,7 @@ extension DogeWalletService {
             await self.update()
         }
         
-        guard storeInKVC else { return eWallet }
+        guard storeInKVS else { return eWallet }
         
         // MARK: 4. Save address into KVS
         let kvsAddressModel = makeKVSAddressModel(wallet: eWallet)
diff --git a/Adamant/Modules/Wallets/ERC20/ERC20WalletService.swift b/Adamant/Modules/Wallets/ERC20/ERC20WalletService.swift
@@ -368,7 +368,7 @@ final class ERC20WalletService: WalletCoreProtocol, @unchecked Sendable {
 
 // MARK: - WalletInitiatedWithPassphrase
 extension ERC20WalletService {
-    func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {
+    func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVS: Bool) async throws -> WalletAccount {
         
         // MARK: 1. Prepare
         setState(.notInitiated)
diff --git a/Adamant/Modules/Wallets/Ethereum/EthWalletService.swift b/Adamant/Modules/Wallets/Ethereum/EthWalletService.swift
@@ -402,7 +402,7 @@ final class EthWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, Smar
 
 // MARK: - WalletInitiatedWithPassphrase
 extension EthWalletService {
-    func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {
+    func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVS: Bool) async throws -> WalletAccount {
         guard let adamant = accountService?.account else {
             throw WalletServiceError.notLogged
         }
@@ -448,7 +448,7 @@ extension EthWalletService {
             await self.update()
         }
         
-        guard storeInKVC else { return eWallet }
+        guard storeInKVS else { return eWallet }
         
         // MARK: 4. Save into KVS
         let kvsAddressModel = makeKVSAddressModel(wallet: eWallet)
diff --git a/Adamant/Modules/Wallets/Klayr/WalletService/KlyWalletService.swift b/Adamant/Modules/Wallets/Klayr/WalletService/KlyWalletService.swift
@@ -99,9 +99,9 @@ final class KlyWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @unc
     // MARK: -
     
     func initWallet(
-        withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool
+        withPassphrase passphrase: String, withPassword password: String, storeInKVS: Bool
     ) async throws -> WalletAccount {
-        try await initWallet(passphrase: passphrase, password: password, storeInKVC: storeInKVC)
+        try await initWallet(passphrase: passphrase, password: password, storeInKVS: storeInKVS)
     }
     
     func setInitiationFailed(reason: String) {
@@ -413,7 +413,7 @@ private extension KlyWalletService {
 
 // MARK: - Init Wallet
 private extension KlyWalletService {
-    func initWallet(passphrase: String, password: String, storeInKVC: Bool) async throws -> WalletAccount {
+    func initWallet(passphrase: String, password: String, storeInKVS: Bool) async throws -> WalletAccount {
         guard let adamant = accountService.account else {
             throw WalletServiceError.notLogged
         }
@@ -471,7 +471,7 @@ private extension KlyWalletService {
             await update()
         }
         
-        guard storeInKVC else { return eWallet }
+        guard storeInKVS else { return eWallet }
         
         // Save into KVS
         
diff --git a/Adamant/Modules/Wallets/WalletsService/WalletCoreProtocol.swift b/Adamant/Modules/Wallets/WalletsService/WalletCoreProtocol.swift
@@ -305,7 +305,7 @@ protocol WalletCoreProtocol: AnyObject, Sendable {
     func updateStatus(for id: String, status: TransactionStatus?)
     func isExist(address: String) async throws -> Bool
     func statusInfoFor(transaction: CoinTransaction) async -> TransactionStatusInfo
-    func initWallet(withPassphrase: String, withPassword: String, storeInKVC: Bool) async throws -> WalletAccount
+    func initWallet(withPassphrase: String, withPassword: String, storeInKVS: Bool) async throws -> WalletAccount
     func setInitiationFailed(reason: String)
     func shortDescription(for transaction: RichMessageTransaction) -> NSAttributedString
     func getFee(comment: String) -> Decimal
diff --git a/Adamant/Services/AdamantAccountService.swift b/Adamant/Services/AdamantAccountService.swift
@@ -428,7 +428,7 @@ extension AdamantAccountService {
                     let result = try? await wallet.core.initWallet(
                         withPassphrase: passphrase,
                         withPassword: .empty,
-                        storeInKVC: true
+                        storeInKVS: true
                     )
                     return result
                 }
diff --git a/Adamant/Services/SecretWalletsFactory.swift b/Adamant/Services/SecretWalletsFactory.swift
@@ -70,7 +70,7 @@ struct SecretWalletsFactory {
                     _ = try? await wallet.core.initWallet(
                         withPassphrase: passphrase,
                         withPassword: password,
-                        storeInKVC: false
+                        storeInKVS: false
                     )
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ final class AdmWalletService: NSObject, WalletCoreProtocol, WalletStaticCoreProt`
`225`	`225`	`.init(sentDate: nil, status: .notInitiated)`
`226`	`226`	`}`
`227`	`227`
`228`		`- func initWallet(withPassphrase: String, withPassword: String, storeInKVC: Bool) async throws -> WalletAccount {`
	`228`	`+ func initWallet(withPassphrase: String, withPassword: String, storeInKVS: Bool) async throws -> WalletAccount {`
`229`	`229`	`throw InternalAPIError.unknownError`
`230`	`230`	`}`
`231`	`231`
Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ extension BtcWalletService {`
`445`	`445`	`btcWallet = nil`
`446`	`446`	`}`
`447`	`447`
`448`		`- func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {`
	`448`	`+ func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVS: Bool) async throws -> WalletAccount {`
`449`	`449`	`guard let adamant = accountService.account else {`
`450`	`450`	`throw WalletServiceError.notLogged`
`451`	`451`	`}`
`@@ -488,7 +488,7 @@ extension BtcWalletService {`
`488`	`488`	`self.update()`
`489`	`489`	`}`
`490`	`490`
`491`		`- guard storeInKVC else { return eWallet }`
	`491`	`+ guard storeInKVS else { return eWallet }`
`492`	`492`
`493`	`493`	`// MARK: 4. Save address into KVS`
`494`	`494`	`let kvsAddressModel = makeKVSAddressModel(wallet: eWallet)`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ extension DashWalletService {`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`@MainActor`
`303`		`- func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {`
	`303`	`+ func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVS: Bool) async throws -> WalletAccount {`
`304`	`304`	`guard let adamant = accountService.account else {`
`305`	`305`	`throw WalletServiceError.notLogged`
`306`	`306`	`}`
`@@ -345,7 +345,7 @@ extension DashWalletService {`
`345`	`345`	`self.update()`
`346`	`346`	`}`
`347`	`347`
`348`		`- guard storeInKVC else { return eWallet }`
	`348`	`+ guard storeInKVS else { return eWallet }`
`349`	`349`
`350`	`350`	`// MARK: 4. Save address into KVS`
`351`	`351`	`let kvsAddressModel = makeKVSAddressModel(wallet: eWallet)`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ extension DogeWalletService {`
`319`	`319`	`dogeWallet = nil`
`320`	`320`	`}`
`321`	`321`
`322`		`- func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {`
	`322`	`+ func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVS: Bool) async throws -> WalletAccount {`
`323`	`323`	`guard let adamant = accountService.account else {`
`324`	`324`	`throw WalletServiceError.notLogged`
`325`	`325`	`}`
`@@ -363,7 +363,7 @@ extension DogeWalletService {`
`363`	`363`	`await self.update()`
`364`	`364`	`}`
`365`	`365`
`366`		`- guard storeInKVC else { return eWallet }`
	`366`	`+ guard storeInKVS else { return eWallet }`
`367`	`367`
`368`	`368`	`// MARK: 4. Save address into KVS`
`369`	`369`	`let kvsAddressModel = makeKVSAddressModel(wallet: eWallet)`
Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ final class EthWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, Smar`
`402`	`402`
`403`	`403`	`// MARK: - WalletInitiatedWithPassphrase`
`404`	`404`	`extension EthWalletService {`
`405`		`- func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {`
	`405`	`+ func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVS: Bool) async throws -> WalletAccount {`
`406`	`406`	`guard let adamant = accountService?.account else {`
`407`	`407`	`throw WalletServiceError.notLogged`
`408`	`408`	`}`
`@@ -448,7 +448,7 @@ extension EthWalletService {`
`448`	`448`	`await self.update()`
`449`	`449`	`}`
`450`	`450`
`451`		`- guard storeInKVC else { return eWallet }`
	`451`	`+ guard storeInKVS else { return eWallet }`
`452`	`452`
`453`	`453`	`// MARK: 4. Save into KVS`
`454`	`454`	`let kvsAddressModel = makeKVSAddressModel(wallet: eWallet)`
Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ extension AdamantAccountService {`
`428`	`428`	`let result = try? await wallet.core.initWallet(`
`429`	`429`	`withPassphrase: passphrase,`
`430`	`430`	`withPassword: .empty,`
`431`		`- storeInKVC: true`
	`431`	`+ storeInKVS: true`
`432`	`432`	`)`
`433`	`433`	`return result`
`434`	`434`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ struct SecretWalletsFactory {`
`70`	`70`	`_ = try? await wallet.core.initWallet(`
`71`	`71`	`withPassphrase: passphrase,`
`72`	`72`	`withPassword: password,`
`73`		`- storeInKVC: false`
	`73`	`+ storeInKVS: false`
`74`	`74`	`)`
`75`	`75`	`}`
`76`	`76`	`}`