commit d7d3d5591a3974ce560628a5269ea0da4e9e50ab
parent ebebc7ba1f625d8bdaec2d9becebfb9a51815d0a
Author: Marc Stibane <marc@taler.net>
Date: Thu, 22 Oct 2026 06:52:01 +0200
compiler warning (unused id)
Diffstat:
10 files changed, 56 insertions(+), 53 deletions(-)
diff --git a/TalerWallet1/Model/Model+Balances.swift b/TalerWallet1/Model/Model+Balances.swift
@@ -169,13 +169,13 @@ extension WalletModel {
/// fetch Balances from Wallet-Core. No networking involved
nonisolated func getBalances(_ stack: CallStack, viewHandles: Bool = false) async throws -> (BalancesResponse, UInt) {
let request = Balances()
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
- return (response, id)
+ let (response, debugId) = try await sendRequest(request, viewHandles: viewHandles)
+ return (response, debugId)
}
/// fetch Discounts from Wallet-Core. No networking involved
nonisolated func listDiscounts(_ stack: CallStack, viewHandles: Bool = false) async throws -> DiscountsResponse {
let request = ListDiscounts()
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
/// delete a discount. No networking involved
@@ -187,7 +187,7 @@ extension WalletModel {
/// fetch Subscriptions from Wallet-Core. No networking involved
nonisolated func listSubscriptions(_ stack: CallStack, viewHandles: Bool = false) async throws -> SubscriptionsResponse {
let request = ListSubscriptions()
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
/// delete a subscription. No networking involved
diff --git a/TalerWallet1/Model/Model+Deposit.swift b/TalerWallet1/Model/Model+Deposit.swift
@@ -38,7 +38,7 @@ extension WalletModel {
nonisolated func validateIban(_ iban: String, viewHandles: Bool = false)
async throws -> Bool {
let request = ValidateIban(iban: iban)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response.valid
}
}
@@ -93,13 +93,13 @@ extension WalletModel {
nonisolated func convertIbanAccountFieldToPayto(_ value: String, currency: String, viewHandles: Bool = false)
async throws -> IbanAccountFieldToPaytoResponse {
let request = IbanAccountFieldToPayto(value: value, currency: currency)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
nonisolated func convertIbanPaytoToAccountField(_ paytoUri: String, viewHandles: Bool = false)
async throws -> IbanPaytoToAccountFieldResponse {
let request = IbanPaytoToAccountField(paytoUri: paytoUri)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
}
@@ -135,7 +135,7 @@ extension WalletModel {
nonisolated func depositWireTypes(_ currency: String?, scopeInfo: ScopeInfo? = nil, viewHandles: Bool = false)
async throws -> [WireTypeDetails] {
let request = DepositWireTypes(currency: currency, scopeInfo: scopeInfo)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response.wireTypeDetails
}
}
@@ -161,7 +161,7 @@ extension WalletModel {
nonisolated func getMaxDepositAmount(_ scope: ScopeInfo, viewHandles: Bool = false)
async throws -> Amount {
let request = GetMaxDepositAmount(scope: scope)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response.rawAmount
}
} // getMaxDepositAmount
@@ -202,7 +202,7 @@ extension WalletModel {
let controller = Controller.shared
controller.progressOperation = request.operation
controller.progressToken = depositPaytoUri
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
}
@@ -237,7 +237,7 @@ extension WalletModel {
let controller = Controller.shared
controller.progressOperation = request.operation
controller.progressToken = depositPaytoUri
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
}
@@ -280,7 +280,7 @@ extension WalletModel {
nonisolated func listBankAccounts(_ currency: String? = nil, viewHandles: Bool = false)
async throws -> [BankAccountsInfo] {
let request = ListBankAccounts(currency: currency)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response.accounts
}
}
@@ -300,7 +300,7 @@ extension WalletModel {
nonisolated func getBankAccountById(_ bankAccountId: String, viewHandles: Bool = false)
async throws -> BankAccountsInfo {
let request = GetBankAccountById(bankAccountId: bankAccountId)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
}
@@ -332,7 +332,7 @@ extension WalletModel {
viewHandles: Bool = false)
async throws -> String {
let request = AddBankAccount(uri: uri, label: label, replace: replace)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response.bankAccountId
}
}
diff --git a/TalerWallet1/Model/Model+Exchange.swift b/TalerWallet1/Model/Model+Exchange.swift
@@ -349,7 +349,7 @@ extension WalletModel {
let request = ListExchanges(scope: scope,
filterByType: filterByType, // .demo, .prod
filterByStatus: filterByStatus) // .used, .preset
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response.exchanges
} catch {
return [] // empty, but not nil
@@ -361,7 +361,7 @@ extension WalletModel {
async -> [DefaultExchange] { // M for MainActor
do {
let request = DefaultExchanges()
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response.candidates
} catch {
return [] // empty, but not nil
@@ -373,7 +373,7 @@ extension WalletModel {
async throws -> Exchange {
let request = GetExchangeByUrl(exchangeBaseUrl: url)
// logger.info("query for exchange: \(url, privacy: .public)")
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
@@ -423,7 +423,7 @@ extension WalletModel {
nonisolated func getCurrencyInfo(scope: ScopeInfo, viewHandles: Bool = false)
async throws -> CurrencyInfo {
let request = GetCurrencySpecification(scope: scope)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return CurrencyInfo(specs: response.currencySpecification,
formatter: CurrencyFormatter.formatter(currency: scope.currency,
specs: response.currencySpecification))
diff --git a/TalerWallet1/Model/Model+P2P.swift b/TalerWallet1/Model/Model+P2P.swift
@@ -41,7 +41,7 @@ extension WalletModel {
viewHandles: Bool = false)
async throws -> Amount {
let request = GetMaxPeerPushDebitAmount(scope: scope)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response.rawAmount
}
} // getMaxPeerPushAmount
@@ -77,7 +77,7 @@ extension WalletModel {
// let controller = Controller.shared
// controller.progressOperation = request.operation
// controller.progressToken = request.operation
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
} // checkPeerPushDebit
@@ -109,7 +109,7 @@ extension WalletModel {
viewHandles: Bool = false)
async throws -> InitiatePeerPushDebitResponse {
let request = InitiatePeerPushDebit(scope: scope, terms: terms)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
} // initiatePeerPushDebit
@@ -147,7 +147,7 @@ extension WalletModel {
let controller = Controller.shared
controller.progressOperation = request.operation
controller.progressToken = request.operation
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
} // checkPeerPullCredit
@@ -176,7 +176,7 @@ extension WalletModel {
async throws -> InitiatePeerPullCreditResponse {
let request = InitiatePeerPullCredit(exchangeBaseUrl: baseURL,
partialContractTerms: terms)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
} // initiatePeerPullCredit
@@ -208,7 +208,10 @@ extension WalletModel {
viewHandles: Bool = false)
async throws -> PreparePeerPushCreditResponse {
let request = PreparePeerPushCredit(talerUri: talerUri)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let controller = Controller.shared
+ controller.progressOperation = request.operation
+ controller.progressToken = talerUri
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
} // preparePeerPushCredit
@@ -229,7 +232,7 @@ extension WalletModel {
viewHandles: Bool = false)
async throws -> Decodable {
let request = AcceptPeerPushCredit(transactionId: transactionId)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
} // acceptPeerPushCredit
@@ -264,7 +267,7 @@ extension WalletModel {
let controller = Controller.shared
controller.progressOperation = request.operation
controller.progressToken = talerUri
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
} // preparePeerPullDebit
@@ -285,7 +288,7 @@ extension WalletModel {
viewHandles: Bool = false)
async throws -> Decodable {
let request = ConfirmPeerPullDebit(transactionId: transactionId)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
} // confirmPeerPullDebit
diff --git a/TalerWallet1/Model/Model+Payment.swift b/TalerWallet1/Model/Model+Payment.swift
@@ -699,7 +699,7 @@ extension WalletModel {
let controller = Controller.shared
controller.progressOperation = request.operation
controller.progressToken = talerPayTemplateUri
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
@@ -710,21 +710,21 @@ extension WalletModel {
let controller = Controller.shared
controller.progressOperation = request.operation
controller.progressToken = talerPayTemplateUri
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
nonisolated func getChoicesForPayment(_ transactionId: String, viewHandles: Bool = false)
async throws -> ChoicesForPayment {
let request = GetChoicesForPayment(transactionId: transactionId, forcedCoinSel: nil)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
nonisolated func preparePayForUri(_ talerPayUri: String, viewHandles: Bool = false)
async throws -> PreparePayResult2 {
let request = PreparePayForUri(talerPayUri: talerPayUri)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
@@ -732,7 +732,7 @@ extension WalletModel {
async throws -> ConfirmPayResult {
let request = ConfirmPayForUri(transactionId: transactionId,
choiceIndex: choiceIndex)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
@@ -742,7 +742,7 @@ extension WalletModel {
let controller = Controller.shared
controller.progressOperation = request.operation
controller.progressToken = transactionId
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response.talerPayUri
}
}
diff --git a/TalerWallet1/Model/Model+Pending.swift b/TalerWallet1/Model/Model+Pending.swift
@@ -47,7 +47,7 @@ extension WalletModel {
nonisolated func getPendingOperations4711(viewHandles: Bool = false)
async throws -> [PendingOperation] { // M for MainActor
let request = GetPendingOperations()
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response.pendingOperations
}
}
diff --git a/TalerWallet1/Model/Model+Refund.swift b/TalerWallet1/Model/Model+Refund.swift
@@ -44,7 +44,7 @@ struct StartRefundQueryRequest: WalletBackendFormattedRequest {
extension WalletModel {
nonisolated func startRefundForUri(url: String, viewHandles: Bool = false) async throws -> String {
let request = StartRefundURIRequest(talerRefundUri: url)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response.transactionId
}
diff --git a/TalerWallet1/Model/Model+Transactions.swift b/TalerWallet1/Model/Model+Transactions.swift
@@ -163,7 +163,7 @@ extension WalletModel {
limit: limit,
offset: offset,
includeRefreshes: includeRefreshes)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response.transactions
}
// MARK: -
diff --git a/TalerWallet1/Model/Model+Withdraw.swift b/TalerWallet1/Model/Model+Withdraw.swift
@@ -262,7 +262,7 @@ extension WalletModel {
let controller = Controller.shared
controller.progressOperation = request.operation
controller.progressToken = talerUri
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
@@ -274,7 +274,7 @@ extension WalletModel {
let controller = Controller.shared
controller.progressOperation = request.operation
controller.progressToken = talerUri
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
@@ -287,7 +287,7 @@ extension WalletModel {
let controller = Controller.shared
controller.progressOperation = request.operation
controller.progressToken = baseUrl
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
@@ -302,7 +302,7 @@ extension WalletModel {
let controller = Controller.shared
controller.progressOperation = request.operation
controller.progressToken = baseUrl
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
@@ -310,7 +310,7 @@ extension WalletModel {
viewHandles: Bool = false)
async throws -> Decodable {
let request = SetExchangeTOSAccepted(baseUrl: baseUrl)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
@@ -325,7 +325,7 @@ extension WalletModel {
let controller = Controller.shared
controller.progressOperation = request.operation
controller.progressToken = withdrawURL
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
@@ -335,7 +335,7 @@ extension WalletModel {
viewHandles: Bool = false)
async throws -> AcceptManualWithdrawalResult? {
let request = AcceptManualWithdrawal(amount: amount, baseUrl: baseUrl, restrictAge: restrictAge)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
}
diff --git a/TalerWallet1/Model/WalletModel.swift b/TalerWallet1/Model/WalletModel.swift
@@ -245,7 +245,7 @@ extension WalletModel {
func hintApplicationResumedT() async throws -> DbStatus {
// T for any Thread
let request = ApplicationResumedRequest()
- let (response, id) = try await sendRequest(request)
+ let (response, _) = try await sendRequest(request)
return response
}
}
@@ -341,7 +341,7 @@ extension WalletModel {
controller.progressToken = txId
controller.lastProgressError = nil
controller.lastProgressPhase = nil
- let (response, id) = try await sendRequest(request)
+ let (response, _) = try await sendRequest(request)
return response
}
nonisolated func cancelProgressToken(_ op: String, token: String)
@@ -358,13 +358,13 @@ extension WalletModel {
nonisolated func getTransactionById(_ transactionId: String, includeContractTerms: Bool? = nil, viewHandles: Bool = false)
async throws -> TalerTransaction {
let request = GetTransactionById(txId: transactionId, inclTerms: includeContractTerms)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
nonisolated func jsonTransactionById(_ transactionId: String, includeContractTerms: Bool? = nil, viewHandles: Bool = false)
async throws -> String {
let request = JSONTransactionById(transactionId: transactionId, includeContractTerms: includeContractTerms)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles, asJSON: true)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles, asJSON: true)
return response
}
}
@@ -440,7 +440,7 @@ extension WalletModel {
@discardableResult
nonisolated func setConfig(setTesting: Bool) async throws -> VersionInfo {
let request = ConfigRequest(setTesting: setTesting)
- let (response, id) = try await sendRequest(request)
+ let (response, _) = try await sendRequest(request)
return response.versionInfo
}
}
@@ -492,7 +492,7 @@ extension WalletModel {
let request = InitRequest(persistentPath: dbPath,
temporaryPath: tmpURL?.path(withSlash: true),
setTesting: setTesting)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
@@ -589,7 +589,7 @@ extension WalletModel {
let controller = Controller.shared
controller.progressOperation = request.operation
controller.progressToken = request.operation
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
}
@@ -661,7 +661,7 @@ extension WalletModel {
let dbPath = docDirUrl.path(withSlash: false)
let request = ExportDbToFile(directory: dbPath, stem: stem, asJSON: asJSON)
print(dbPath, stem)
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
return response.path
} else {
return nil
@@ -675,13 +675,13 @@ extension WalletModel {
nonisolated func getDiagnostics(viewHandles: Bool = false)
async throws -> String {
let request = GetDiagnostics()
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles, asJSON: true)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles, asJSON: true)
return response
}
nonisolated func getPerformanceStats(viewHandles: Bool = false)
async throws -> String {
let request = GetPerformanceStats()
- let (response, id) = try await sendRequest(request, viewHandles: viewHandles, asJSON: true)
+ let (response, _) = try await sendRequest(request, viewHandles: viewHandles, asJSON: true)
return response
}
}
