[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 11/32: bankAccessApiBaseUrl -> corebankApiBaseUrl
From: |
gnunet |
Subject: |
[taler-taler-ios] 11/32: bankAccessApiBaseUrl -> corebankApiBaseUrl |
Date: |
Mon, 16 Oct 2023 00:03:09 +0200 |
This is an automated email from the git hooks/post-receive script.
marc-stibane pushed a commit to branch master
in repository taler-ios.
commit f7e9c2e0b2775b64daa26b2d6d9693031caf3d0f
Author: Marc Stibane <marc@taler.net>
AuthorDate: Fri Oct 13 10:02:18 2023 +0200
bankAccessApiBaseUrl -> corebankApiBaseUrl
---
TalerWallet1/Model/Model+Settings.swift | 71 +++++++++++++++++----------------
1 file changed, 36 insertions(+), 35 deletions(-)
diff --git a/TalerWallet1/Model/Model+Settings.swift
b/TalerWallet1/Model/Model+Settings.swift
index fb9a855..5dff9f8 100644
--- a/TalerWallet1/Model/Model+Settings.swift
+++ b/TalerWallet1/Model/Model+Settings.swift
@@ -7,76 +7,77 @@ import taler_swift
import SymLog
fileprivate let ASYNCDELAY: UInt = 0 //set e.g to 6 or 9 seconds for
debugging
-fileprivate let APIBASEURL = "/demobanks/default/access-api/"
fileprivate let MERCHANTAUTHTOKEN = "secret-token:sandbox"
// MARK: -
/// A request to add a test balance to the wallet.
-fileprivate struct WalletBackendWithdrawTestBalance:
WalletBackendFormattedRequest {
+fileprivate struct WithdrawTestBalanceRequest: WalletBackendFormattedRequest {
struct Response: Decodable {} // no result - getting no error back means
success
func operation() -> String { return "withdrawTestBalance" }
func args() -> Args {
- return Args(amount: amount, bankBaseUrl: bankBaseUrl,
- exchangeBaseUrl: exchangeBaseUrl, bankAccessApiBaseUrl:
bankAccessApiBaseUrl)
+ return Args(amount: amount,
+// bankBaseUrl: bankBaseUrl,
+ corebankApiBaseUrl: corebankApiBaseUrl,
+ exchangeBaseUrl: exchangeBaseUrl)
}
var amount: Amount
- var bankBaseUrl: String
+// var bankBaseUrl: String
+ var corebankApiBaseUrl: String
var exchangeBaseUrl: String
- var bankAccessApiBaseUrl: String
struct Args: Encodable {
var amount: Amount
- var bankBaseUrl: String
+// var bankBaseUrl: String // <= this should be
the correct parameter name
+ var corebankApiBaseUrl: String // <= but currently this
is used by wallet-core
var exchangeBaseUrl: String
- var bankAccessApiBaseUrl: String
}
}
extension WalletModel {
@MainActor func loadTestKudosM(test: Bool)
async throws { // M for MainActor
let amount = Amount(currency: test ? TESTCURRENCY : DEMOCURRENCY,
integer: 11, fraction: 0)
- let request = WalletBackendWithdrawTestBalance(amount: amount,
- bankBaseUrl: test ?
TESTBANK : DEMOBANK,
- exchangeBaseUrl: test ?
TESTEXCHANGE : DEMOEXCHANGE,
- bankAccessApiBaseUrl:
(test ? TESTBANK : DEMOBANK) + APIBASEURL)
+ let request = WithdrawTestBalanceRequest(amount: amount,
+// bankBaseUrl: test ?
TESTBANK : DEMOBANK,
+ corebankApiBaseUrl: test ?
TESTBANK : DEMOBANK,
+ exchangeBaseUrl: test ?
TESTEXCHANGE : DEMOEXCHANGE)
let response = try await sendRequest(request, ASYNCDELAY)
}
} // loadTestKudosM()
// MARK: -
/// A request to add a test balance to the wallet.
-fileprivate struct WalletBackendRunIntegration: WalletBackendFormattedRequest {
+fileprivate struct RunIntegrationTest: WalletBackendFormattedRequest {
struct Response: Decodable {} // no result - getting no error back means
success
func operation() -> String { return newVersion ? "runIntegrationTestV2" :
"runIntegrationTest" }
func args() -> Args {
- return Args(amountToWithdraw: amountToWithdraw,
- amountToSpend: amountToSpend,
- bankBaseUrl: bankBaseUrl,
- bankAccessApiBaseUrl: bankAccessApiBaseUrl,
- exchangeBaseUrl: exchangeBaseUrl,
+ return Args(exchangeBaseUrl: exchangeBaseUrl,
+// bankBaseUrl: bankBaseUrl,
+ corebankApiBaseUrl: corebankApiBaseUrl,
merchantBaseUrl: merchantBaseUrl,
- merchantAuthToken: merchantAuthToken
+ merchantAuthToken: merchantAuthToken,
+ amountToWithdraw: amountToWithdraw,
+ amountToSpend: amountToSpend
)
}
let newVersion: Bool
- var amountToWithdraw: Amount
- var amountToSpend: Amount
- var bankBaseUrl: String
- var bankAccessApiBaseUrl: String
var exchangeBaseUrl: String
+// var bankBaseUrl: String
+ var corebankApiBaseUrl: String
var merchantBaseUrl: String
var merchantAuthToken: String
+ var amountToWithdraw: Amount
+ var amountToSpend: Amount
struct Args: Encodable {
- var amountToWithdraw: Amount
- var amountToSpend: Amount
- var bankBaseUrl: String
- var bankAccessApiBaseUrl: String
var exchangeBaseUrl: String
+// var bankBaseUrl: String
+ var corebankApiBaseUrl: String
var merchantBaseUrl: String
var merchantAuthToken: String
+ var amountToWithdraw: Amount
+ var amountToSpend: Amount
}
}
extension WalletModel {
@@ -84,14 +85,14 @@ extension WalletModel {
async throws { // M for MainActor
let amountW = Amount(currency: test ? TESTCURRENCY : DEMOCURRENCY,
integer: 3, fraction: 0)
let amountS = Amount(currency: test ? TESTCURRENCY : DEMOCURRENCY,
integer: 1, fraction: 0)
- let request = WalletBackendRunIntegration(newVersion: newVersion,
- amountToWithdraw: amountW,
- amountToSpend: amountS,
- bankBaseUrl: (test ?
TESTBANK : DEMOBANK) + APIBASEURL,
- bankAccessApiBaseUrl: (test
? TESTBANK : DEMOBANK) + APIBASEURL,
- exchangeBaseUrl: test ?
TESTEXCHANGE : DEMOEXCHANGE,
- merchantBaseUrl: test ?
TESTBACKEND : DEMOBACKEND,
- merchantAuthToken:
MERCHANTAUTHTOKEN)
+ let request = RunIntegrationTest(newVersion: newVersion,
+ exchangeBaseUrl: test ? TESTEXCHANGE
: DEMOEXCHANGE,
+// bankBaseUrl: (test ? TESTBANK :
DEMOBANK),
+ corebankApiBaseUrl: (test ? TESTBANK
: DEMOBANK),
+ merchantBaseUrl: test ? TESTBACKEND :
DEMOBACKEND,
+ merchantAuthToken: MERCHANTAUTHTOKEN,
+ amountToWithdraw: amountW,
+ amountToSpend: amountS)
let _ = try await sendRequest(request, ASYNCDELAY)
}
} // runIntegrationTestM()
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] 10/32: secret token, (continued)
- [taler-taler-ios] 10/32: secret token, gnunet, 2023/10/15
- [taler-taler-ios] 15/32: TwoRowButtons, gnunet, 2023/10/15
- [taler-taler-ios] 05/32: No spellout, gnunet, 2023/10/15
- [taler-taler-ios] 09/32: TabBar for Taler Wallet - GNU Taler stays on SideView, gnunet, 2023/10/15
- [taler-taler-ios] 16/32: Source of Truth for balances, gnunet, 2023/10/15
- [taler-taler-ios] 30/32: font, gnunet, 2023/10/15
- [taler-taler-ios] 27/32: SingleAxisGeometryReader, gnunet, 2023/10/15
- [taler-taler-ios] 06/32: More CallStack for Debugging, gnunet, 2023/10/15
- [taler-taler-ios] 07/32: AsyncSemaphore, gnunet, 2023/10/15
- [taler-taler-ios] 23/32: fix for broken scalable font (not finished), gnunet, 2023/10/15
- [taler-taler-ios] 11/32: bankAccessApiBaseUrl -> corebankApiBaseUrl,
gnunet <=
- [taler-taler-ios] 12/32: AsyncSemaphore to serialize Getbalances, gnunet, 2023/10/15
- [taler-taler-ios] 31/32: comment, gnunet, 2023/10/15
- [taler-taler-ios] 25/32: Bargraph after Currency, gnunet, 2023/10/15
- [taler-taler-ios] 32/32: Bump version to 0.9.3 (20), gnunet, 2023/10/15
- [taler-taler-ios] 21/32: cleanup, gnunet, 2023/10/15
- [taler-taler-ios] 26/32: cleanup, gnunet, 2023/10/15
- [taler-taler-ios] 22/32: badge, gnunet, 2023/10/15
- [taler-taler-ios] 28/32: Button Layout, gnunet, 2023/10/15
- [taler-taler-ios] 20/32: Preparation for Exchange deposit only with positive balance, gnunet, 2023/10/15
- [taler-taler-ios] 29/32: BarGraph also for Exchanges, gnunet, 2023/10/15