diff options
Diffstat (limited to 'packages/taler-harness/src')
22 files changed, 89 insertions, 71 deletions
diff --git a/packages/taler-harness/src/bench1.ts b/packages/taler-harness/src/bench1.ts index efe162320..b78fadf0b 100644 --- a/packages/taler-harness/src/bench1.ts +++ b/packages/taler-harness/src/bench1.ts @@ -18,6 +18,7 @@ * Imports. */ import { + AmountString, buildCodecForObject, codecForBoolean, codecForNumber, @@ -97,7 +98,7 @@ export async function runBench1(configJson: any): Promise<void> { let start = Date.now(); await wallet.client.call(WalletApiOperation.WithdrawTestBalance, { - amount: b1conf.currency + ":" + withdrawAmount, + amount: b1conf.currency + ":" + withdrawAmount as AmountString, corebankApiBaseUrl: b1conf.bank, exchangeBaseUrl: b1conf.exchange, }); @@ -116,7 +117,7 @@ export async function runBench1(configJson: any): Promise<void> { start = Date.now(); await wallet.client.call(WalletApiOperation.CreateDepositGroup, { - amount: b1conf.currency + ":10", + amount: b1conf.currency + ":10" as AmountString, depositPaytoUri: b1conf.payto, }); diff --git a/packages/taler-harness/src/bench2.ts b/packages/taler-harness/src/bench2.ts index 53db6f6c1..87bc2ff7f 100644 --- a/packages/taler-harness/src/bench2.ts +++ b/packages/taler-harness/src/bench2.ts @@ -18,6 +18,7 @@ * Imports. */ import { + AmountString, buildCodecForObject, codecForNumber, codecForString, @@ -85,7 +86,7 @@ export async function runBench2(configJson: any): Promise<void> { console.log("reserve found"); - const d1 = findDenomOrThrow(exchangeInfo, `${curr}:8`, { + const d1 = findDenomOrThrow(exchangeInfo, `${curr}:8` as AmountString, { denomselAllowLate: Wallet.defaultConfig.testing.denomselAllowLate, }); @@ -105,7 +106,7 @@ export async function runBench2(configJson: any): Promise<void> { console.log("depositing coin"); await depositCoin({ - amount: `${curr}:4`, + amount: `${curr}:4` as AmountString, coin: coin, cryptoApi, exchangeBaseUrl: benchConf.exchange, @@ -114,10 +115,10 @@ export async function runBench2(configJson: any): Promise<void> { }); const refreshDenoms = [ - findDenomOrThrow(exchangeInfo, `${curr}:1`, { + findDenomOrThrow(exchangeInfo, `${curr}:1` as AmountString, { denomselAllowLate: Wallet.defaultConfig.testing.denomselAllowLate, }), - findDenomOrThrow(exchangeInfo, `${curr}:1`, { + findDenomOrThrow(exchangeInfo, `${curr}:1` as AmountString, { denomselAllowLate: Wallet.defaultConfig.testing.denomselAllowLate, }), ]; diff --git a/packages/taler-harness/src/bench3.ts b/packages/taler-harness/src/bench3.ts index bc345aa9e..c810f6804 100644 --- a/packages/taler-harness/src/bench3.ts +++ b/packages/taler-harness/src/bench3.ts @@ -18,6 +18,7 @@ * Imports. */ import { + AmountString, buildCodecForObject, codecForNumber, codecForString, @@ -108,7 +109,7 @@ export async function runBench3(configJson: any): Promise<void> { let start = Date.now(); await wallet.client.call(WalletApiOperation.WithdrawTestBalance, { - amount: b3conf.currency + ":" + withdrawAmount, + amount: b3conf.currency + ":" + withdrawAmount as AmountString, corebankApiBaseUrl: b3conf.bank, exchangeBaseUrl: b3conf.exchange, }); @@ -129,7 +130,7 @@ export async function runBench3(configJson: any): Promise<void> { let payto = b3conf.paytoTemplate.replace("${id}", merchID.toString()); await wallet.client.call(WalletApiOperation.CreateDepositGroup, { - amount: b3conf.currency + ":10", + amount: b3conf.currency + ":10" as AmountString, depositPaytoUri: payto, }); diff --git a/packages/taler-harness/src/harness/helpers.ts b/packages/taler-harness/src/harness/helpers.ts index 8c1612457..adf43f6d0 100644 --- a/packages/taler-harness/src/harness/helpers.ts +++ b/packages/taler-harness/src/harness/helpers.ts @@ -554,7 +554,7 @@ export async function withdrawViaBankV2( walletClient: WalletClient; bank: BankService; exchange: ExchangeServiceInterface; - amount: AmountString; + amount: AmountString | string; restrictAge?: number; }, ): Promise<WithdrawViaBankResult> { diff --git a/packages/taler-harness/src/index.ts b/packages/taler-harness/src/index.ts index 076f71355..09b953a22 100644 --- a/packages/taler-harness/src/index.ts +++ b/packages/taler-harness/src/index.ts @@ -33,6 +33,7 @@ import { MerchantInstanceConfig, Duration, generateIban, + AmountString, } from "@gnu-taler/taler-util"; import { clk } from "@gnu-taler/taler-util/clk"; import { @@ -225,7 +226,7 @@ deploymentCli .requiredOption("bankAccount", ["--bank-account"], clk.STRING) .requiredOption("bankPassword", ["--bank-password"], clk.STRING) .requiredOption("wireMethod", ["--wire-method"], clk.STRING) - .requiredOption("amount", ["--amount"], clk.STRING) + .requiredOption("amount", ["--amount"], clk.AMOUNT) .action(async (args) => { const amount = args.tipTopup.amount; @@ -323,7 +324,7 @@ deploymentCli const exchangeBaseUrl = "https://exchange.demo.taler.net/"; const exchangeInfo = await downloadExchangeInfo(exchangeBaseUrl, http); await topupReserveWithDemobank({ - amount: "KUDOS:10", + amount: "KUDOS:10" as AmountString, corebankApiBaseUrl: "https://bank.demo.taler.net/", exchangeInfo, http, @@ -351,7 +352,7 @@ deploymentCli const exchangeBaseUrl = "https://exchange.test.taler.net/"; const exchangeInfo = await downloadExchangeInfo(exchangeBaseUrl, http); await topupReserveWithDemobank({ - amount: "TESTKUDOS:10", + amount: "TESTKUDOS:10" as AmountString, corebankApiBaseUrl: "https://bank.test.taler.net/", exchangeInfo, http, @@ -380,7 +381,7 @@ deploymentCli const exchangeBaseUrl = "http://localhost:8081/"; const exchangeInfo = await downloadExchangeInfo(exchangeBaseUrl, http); await topupReserveWithDemobank({ - amount: "TESTKUDOS:10", + amount: "TESTKUDOS:10" as AmountString, corebankApiBaseUrl: "http://localhost:8082/taler-bank-access/", exchangeInfo, http, diff --git a/packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts b/packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts index 5653e22e2..bd4318498 100644 --- a/packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts +++ b/packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts @@ -30,6 +30,7 @@ import { TalerCorebankApiClient, MerchantApiClient, WireGatewayApiClient, + AmountString, } from "@gnu-taler/taler-util"; /** @@ -78,7 +79,7 @@ export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) { walletClient: walletClientZero, bank, exchange, - amount: "TESTKUDOS:20", + amount: "TESTKUDOS:20" as AmountString, restrictAge: 13, }); await wres.withdrawalFinishedCond; @@ -108,7 +109,7 @@ export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) { walletClient, bank, exchange, - amount: "TESTKUDOS:20", + amount: "TESTKUDOS:20" as AmountString, restrictAge: 13, }); await wres.withdrawalFinishedCond; @@ -134,7 +135,7 @@ export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) { walletClient, bank, exchange, - amount: "TESTKUDOS:20", + amount: "TESTKUDOS:20" as AmountString, restrictAge: 13, }); await wres.withdrawalFinishedCond; @@ -159,7 +160,7 @@ export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) { walletClient, bank, exchange, - amount: "TESTKUDOS:20", + amount: "TESTKUDOS:20" as AmountString, }); await wres.withdrawalFinishedCond; @@ -183,7 +184,7 @@ export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) { const mbu = await bankClient.createRandomBankUser(); const tipReserveResp = await merchantClient.createTippingReserve({ exchange_url: exchange.baseUrl, - initial_balance: "TESTKUDOS:10", + initial_balance: "TESTKUDOS:10" as AmountString, wire_method: getWireMethodForTest(), }); @@ -211,7 +212,7 @@ export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) { await exchange.runWirewatchOnce(); const tip = await merchantClient.giveTip({ - amount: "TESTKUDOS:5", + amount: "TESTKUDOS:5" as AmountString, justification: "why not?", next_url: "https://example.com/after-tip", }); diff --git a/packages/taler-harness/src/integrationtests/test-age-restrictions-mixed-merchant.ts b/packages/taler-harness/src/integrationtests/test-age-restrictions-mixed-merchant.ts index af90ef1c5..244de1972 100644 --- a/packages/taler-harness/src/integrationtests/test-age-restrictions-mixed-merchant.ts +++ b/packages/taler-harness/src/integrationtests/test-age-restrictions-mixed-merchant.ts @@ -26,6 +26,7 @@ import { makeTestPaymentV2, withdrawViaBankV2, } from "../harness/helpers.js"; +import { AmountString } from "@gnu-taler/taler-util"; /** * Run test for basic, bank-integrated withdrawal and payment. @@ -62,7 +63,7 @@ export async function runAgeRestrictionsMixedMerchantTest(t: GlobalTestState) { walletClient, bank, exchange, - amount: "TESTKUDOS:20", + amount: "TESTKUDOS:20" as AmountString, restrictAge: 13, }); @@ -70,7 +71,7 @@ export async function runAgeRestrictionsMixedMerchantTest(t: GlobalTestState) { const order = { summary: "Buy me!", - amount: "TESTKUDOS:5", + amount: "TESTKUDOS:5" as AmountString, fulfillment_url: "taler://fulfillment-success/thx", minimum_age: 9, }; @@ -87,7 +88,7 @@ export async function runAgeRestrictionsMixedMerchantTest(t: GlobalTestState) { walletClient: walletTwo, bank, exchange, - amount: "TESTKUDOS:20", + amount: "TESTKUDOS:20" as AmountString, restrictAge: 13, }); @@ -96,7 +97,7 @@ export async function runAgeRestrictionsMixedMerchantTest(t: GlobalTestState) { const order = { summary: "Buy me!", - amount: "TESTKUDOS:5", + amount: "TESTKUDOS:5" as AmountString, fulfillment_url: "taler://fulfillment-success/thx", }; @@ -109,7 +110,7 @@ export async function runAgeRestrictionsMixedMerchantTest(t: GlobalTestState) { walletClient: walletThree, bank, exchange, - amount: "TESTKUDOS:20", + amount: "TESTKUDOS:20" as AmountString, }); diff --git a/packages/taler-harness/src/integrationtests/test-age-restrictions-peer.ts b/packages/taler-harness/src/integrationtests/test-age-restrictions-peer.ts index 45a4391cb..7506d48b3 100644 --- a/packages/taler-harness/src/integrationtests/test-age-restrictions-peer.ts +++ b/packages/taler-harness/src/integrationtests/test-age-restrictions-peer.ts @@ -19,6 +19,7 @@ */ import { AbsoluteTime, + AmountString, Duration, NotificationType, TransactionMajorState, @@ -82,7 +83,7 @@ export async function runAgeRestrictionsPeerTest(t: GlobalTestState) { { partialContractTerms: { summary: "Hello, World", - amount: "TESTKUDOS:1", + amount: "TESTKUDOS:1" as AmountString, purse_expiration, }, }, diff --git a/packages/taler-harness/src/integrationtests/test-deposit.ts b/packages/taler-harness/src/integrationtests/test-deposit.ts index d4bfa3da5..1f50377f2 100644 --- a/packages/taler-harness/src/integrationtests/test-deposit.ts +++ b/packages/taler-harness/src/integrationtests/test-deposit.ts @@ -18,6 +18,7 @@ * Imports. */ import { + AmountString, NotificationType, TransactionMajorState, TransactionMinorState, @@ -74,7 +75,7 @@ export async function runDepositTest(t: GlobalTestState) { const depositGroupResult = await walletClient.client.call( WalletApiOperation.CreateDepositGroup, { - amount: "TESTKUDOS:10", + amount: "TESTKUDOS:10" as AmountString, depositPaytoUri: generateRandomPayto("foo"), transactionId: depositTxId, }, diff --git a/packages/taler-harness/src/integrationtests/test-exchange-deposit.ts b/packages/taler-harness/src/integrationtests/test-exchange-deposit.ts index 8ad7daa63..8e1726aba 100644 --- a/packages/taler-harness/src/integrationtests/test-exchange-deposit.ts +++ b/packages/taler-harness/src/integrationtests/test-exchange-deposit.ts @@ -18,6 +18,7 @@ * Imports. */ import { + AmountString, encodeCrock, getRandomBytes, j2s, @@ -65,7 +66,7 @@ export async function runExchangeDepositTest(t: GlobalTestState) { await topupReserveWithDemobank({ http, - amount: "TESTKUDOS:10", + amount: "TESTKUDOS:10" as AmountString, corebankApiBaseUrl: bank.corebankApiBaseUrl, exchangeInfo, reservePub: reserveKeyPair.pub, @@ -75,7 +76,7 @@ export async function runExchangeDepositTest(t: GlobalTestState) { await checkReserve(http, exchange.baseUrl, reserveKeyPair.pub); - const d1 = findDenomOrThrow(exchangeInfo, "TESTKUDOS:8", { + const d1 = findDenomOrThrow(exchangeInfo, "TESTKUDOS:8" as AmountString, { denomselAllowLate: Wallet.defaultConfig.testing.denomselAllowLate, }); @@ -98,7 +99,7 @@ export async function runExchangeDepositTest(t: GlobalTestState) { contractTermsHash, merchantPub, wireSalt, - amount: "TESTKUDOS:4", + amount: "TESTKUDOS:4" as AmountString, coin: coin, cryptoApi, exchangeBaseUrl: exchange.baseUrl, @@ -110,7 +111,7 @@ export async function runExchangeDepositTest(t: GlobalTestState) { contractTermsHash, merchantPub, wireSalt, - amount: "TESTKUDOS:4", + amount: "TESTKUDOS:4" as AmountString, coin: coin, cryptoApi, exchangeBaseUrl: exchange.baseUrl, @@ -123,7 +124,7 @@ export async function runExchangeDepositTest(t: GlobalTestState) { contractTermsHash, merchantPub, wireSalt, - amount: "TESTKUDOS:3.5", + amount: "TESTKUDOS:3.5" as AmountString, coin: coin, cryptoApi, exchangeBaseUrl: exchange.baseUrl, diff --git a/packages/taler-harness/src/integrationtests/test-exchange-purse.ts b/packages/taler-harness/src/integrationtests/test-exchange-purse.ts index 33a09ed16..c3815e1de 100644 --- a/packages/taler-harness/src/integrationtests/test-exchange-purse.ts +++ b/packages/taler-harness/src/integrationtests/test-exchange-purse.ts @@ -19,6 +19,7 @@ */ import { AbsoluteTime, + AmountString, ContractTermsUtil, decodeCrock, Duration, @@ -76,7 +77,7 @@ export async function runExchangePurseTest(t: GlobalTestState) { }); await topupReserveWithDemobank({ - amount: "TESTKUDOS:10", + amount: "TESTKUDOS:10" as AmountString, http, reservePub: reserveKeyPair.pub, corebankApiBaseUrl: bank.corebankApiBaseUrl, @@ -91,7 +92,7 @@ export async function runExchangePurseTest(t: GlobalTestState) { await checkReserve(http, exchange.baseUrl, reserveKeyPair.pub); - const d1 = findDenomOrThrow(exchangeInfo, "TESTKUDOS:8", { + const d1 = findDenomOrThrow(exchangeInfo, "TESTKUDOS:8" as AmountString, { denomselAllowLate: Wallet.defaultConfig.testing.denomselAllowLate, }); @@ -106,7 +107,7 @@ export async function runExchangePurseTest(t: GlobalTestState) { exchangeBaseUrl: exchange.baseUrl, }); - const amount = "TESTKUDOS:5"; + const amount = "TESTKUDOS:5" as AmountString; const purseFee = "TESTKUDOS:0"; const mergeTimestamp = TalerPreciseTimestamp.now(); diff --git a/packages/taler-harness/src/integrationtests/test-forced-selection.ts b/packages/taler-harness/src/integrationtests/test-forced-selection.ts index 917ad2025..752810703 100644 --- a/packages/taler-harness/src/integrationtests/test-forced-selection.ts +++ b/packages/taler-harness/src/integrationtests/test-forced-selection.ts @@ -17,7 +17,7 @@ /** * Imports. */ -import { j2s } from "@gnu-taler/taler-util"; +import { AmountString, j2s } from "@gnu-taler/taler-util"; import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; import { GlobalTestState } from "../harness/harness.js"; import { createSimpleTestkudosEnvironmentV2 } from "../harness/helpers.js"; @@ -37,12 +37,12 @@ export async function runForcedSelectionTest(t: GlobalTestState) { await walletClient.call(WalletApiOperation.WithdrawTestBalance, { exchangeBaseUrl: exchange.baseUrl, - amount: "TESTKUDOS:10", + amount: "TESTKUDOS:10" as AmountString, corebankApiBaseUrl: bank.corebankApiBaseUrl, forcedDenomSel: { denoms: [ { - value: "TESTKUDOS:2", + value: "TESTKUDOS:2" as AmountString, count: 3, }, ], @@ -56,22 +56,22 @@ export async function runForcedSelectionTest(t: GlobalTestState) { t.assertDeepEqual(coinDump.coins.length, 3); const payResp = await walletClient.call(WalletApiOperation.TestPay, { - amount: "TESTKUDOS:3", + amount: "TESTKUDOS:3" as AmountString, merchantBaseUrl: merchant.makeInstanceBaseUrl(), summary: "bla", forcedCoinSel: { coins: [ { - value: "TESTKUDOS:2", - contribution: "TESTKUDOS:1", + value: "TESTKUDOS:2" as AmountString, + contribution: "TESTKUDOS:1" as AmountString, }, { - value: "TESTKUDOS:2", - contribution: "TESTKUDOS:1", + value: "TESTKUDOS:2" as AmountString, + contribution: "TESTKUDOS:1" as AmountString, }, { - value: "TESTKUDOS:2", - contribution: "TESTKUDOS:1", + value: "TESTKUDOS:2" as AmountString, + contribution: "TESTKUDOS:1" as AmountString, }, ], }, diff --git a/packages/taler-harness/src/integrationtests/test-peer-repair.ts b/packages/taler-harness/src/integrationtests/test-peer-repair.ts index d457ce1e5..977316174 100644 --- a/packages/taler-harness/src/integrationtests/test-peer-repair.ts +++ b/packages/taler-harness/src/integrationtests/test-peer-repair.ts @@ -19,6 +19,7 @@ */ import { AbsoluteTime, + AmountString, Duration, NotificationType, TransactionMajorState, @@ -92,7 +93,7 @@ export async function runPeerRepairTest(t: GlobalTestState) { exchangeBaseUrl: exchange.baseUrl, partialContractTerms: { summary: "Hello World", - amount: "TESTKUDOS:3", + amount: "TESTKUDOS:3" as AmountString, purse_expiration, }, }, @@ -160,7 +161,7 @@ export async function runPeerRepairTest(t: GlobalTestState) { exchangeBaseUrl: exchange.baseUrl, partialContractTerms: { summary: "Hello World", - amount: "TESTKUDOS:3", + amount: "TESTKUDOS:3" as AmountString, purse_expiration, }, }, diff --git a/packages/taler-harness/src/integrationtests/test-peer-to-peer-pull.ts b/packages/taler-harness/src/integrationtests/test-peer-to-peer-pull.ts index 6d9f44fb5..7ed716bc1 100644 --- a/packages/taler-harness/src/integrationtests/test-peer-to-peer-pull.ts +++ b/packages/taler-harness/src/integrationtests/test-peer-to-peer-pull.ts @@ -19,6 +19,7 @@ */ import { AbsoluteTime, + AmountString, Duration, j2s, NotificationType, @@ -86,7 +87,7 @@ export async function runPeerToPeerPullTest(t: GlobalTestState) { exchangeBaseUrl: exchange.baseUrl, partialContractTerms: { summary: "Hello World", - amount: "TESTKUDOS:5", + amount: "TESTKUDOS:5" as AmountString, purse_expiration: purseExpiration, }, }, diff --git a/packages/taler-harness/src/integrationtests/test-peer-to-peer-push.ts b/packages/taler-harness/src/integrationtests/test-peer-to-peer-push.ts index 018fa2020..44c7bf399 100644 --- a/packages/taler-harness/src/integrationtests/test-peer-to-peer-push.ts +++ b/packages/taler-harness/src/integrationtests/test-peer-to-peer-push.ts @@ -19,6 +19,7 @@ */ import { AbsoluteTime, + AmountString, Duration, NotificationType, TransactionMajorState, @@ -80,7 +81,7 @@ export async function runPeerToPeerPushTest(t: GlobalTestState) { { partialContractTerms: { summary: "Hello World 😁😇", - amount: "TESTKUDOS:5", + amount: "TESTKUDOS:5" as AmountString, purse_expiration, }, }, @@ -96,7 +97,7 @@ export async function runPeerToPeerPushTest(t: GlobalTestState) { { partialContractTerms: { summary: "Hello World 🥺", - amount: "TESTKUDOS:5", + amount: "TESTKUDOS:5" as AmountString, purse_expiration, }, }, @@ -148,7 +149,7 @@ export async function runPeerToPeerPushTest(t: GlobalTestState) { await w1.walletClient.call(WalletApiOperation.InitiatePeerPushDebit, { partialContractTerms: { summary: "(this will fail)", - amount: "TESTKUDOS:15", + amount: "TESTKUDOS:15" as AmountString, purse_expiration, }, }); diff --git a/packages/taler-harness/src/integrationtests/test-tipping.ts b/packages/taler-harness/src/integrationtests/test-tipping.ts index 12cdbae53..16859f98c 100644 --- a/packages/taler-harness/src/integrationtests/test-tipping.ts +++ b/packages/taler-harness/src/integrationtests/test-tipping.ts @@ -22,6 +22,7 @@ import { MerchantApiClient, TransactionMajorState, WireGatewayApiClient, + AmountString, } from "@gnu-taler/taler-util"; import { WalletApiOperation, @@ -47,7 +48,7 @@ export async function runTippingTest(t: GlobalTestState) { const tipReserveResp = await merchantClient.createTippingReserve({ exchange_url: exchange.baseUrl, - initial_balance: "TESTKUDOS:10", + initial_balance: "TESTKUDOS:10" as AmountString, wire_method: getWireMethodForTest(), }); @@ -90,7 +91,7 @@ export async function runTippingTest(t: GlobalTestState) { ); const tip = await merchantClient.giveTip({ - amount: "TESTKUDOS:5", + amount: "TESTKUDOS:5" as AmountString, justification: "why not?", next_url: "https://example.com/after-tip", }); diff --git a/packages/taler-harness/src/integrationtests/test-wallet-dbless.ts b/packages/taler-harness/src/integrationtests/test-wallet-dbless.ts index 5e6539654..32534f2c8 100644 --- a/packages/taler-harness/src/integrationtests/test-wallet-dbless.ts +++ b/packages/taler-harness/src/integrationtests/test-wallet-dbless.ts @@ -18,6 +18,7 @@ * Imports. */ import { + AmountString, encodeCrock, getRandomBytes, j2s, @@ -69,7 +70,7 @@ export async function runWalletDblessTest(t: GlobalTestState) { }); await topupReserveWithDemobank({ - amount: "TESTKUDOS:10", + amount: "TESTKUDOS:10" as AmountString, http, reservePub: reserveKeyPair.pub, corebankApiBaseUrl: bank.corebankApiBaseUrl, @@ -84,7 +85,7 @@ export async function runWalletDblessTest(t: GlobalTestState) { await checkReserve(http, exchange.baseUrl, reserveKeyPair.pub); - const d1 = findDenomOrThrow(exchangeInfo, "TESTKUDOS:8", { + const d1 = findDenomOrThrow(exchangeInfo, "TESTKUDOS:8" as AmountString, { denomselAllowLate: Wallet.defaultConfig.testing.denomselAllowLate, }); @@ -107,7 +108,7 @@ export async function runWalletDblessTest(t: GlobalTestState) { contractTermsHash, merchantPub, wireSalt, - amount: "TESTKUDOS:4", + amount: "TESTKUDOS:4" as AmountString, coin: coin, cryptoApi, exchangeBaseUrl: exchange.baseUrl, @@ -119,7 +120,7 @@ export async function runWalletDblessTest(t: GlobalTestState) { contractTermsHash, merchantPub, wireSalt, - amount: "TESTKUDOS:4", + amount: "TESTKUDOS:4" as AmountString, coin: coin, cryptoApi, exchangeBaseUrl: exchange.baseUrl, @@ -127,10 +128,10 @@ export async function runWalletDblessTest(t: GlobalTestState) { }); const refreshDenoms = [ - findDenomOrThrow(exchangeInfo, "TESTKUDOS:1", { + findDenomOrThrow(exchangeInfo, "TESTKUDOS:1" as AmountString, { denomselAllowLate: Wallet.defaultConfig.testing.denomselAllowLate, }), - findDenomOrThrow(exchangeInfo, "TESTKUDOS:1", { + findDenomOrThrow(exchangeInfo, "TESTKUDOS:1" as AmountString, { denomselAllowLate: Wallet.defaultConfig.testing.denomselAllowLate, }), ]; diff --git a/packages/taler-harness/src/integrationtests/test-wallet-gendb.ts b/packages/taler-harness/src/integrationtests/test-wallet-gendb.ts index ff6ed9959..9e3b60899 100644 --- a/packages/taler-harness/src/integrationtests/test-wallet-gendb.ts +++ b/packages/taler-harness/src/integrationtests/test-wallet-gendb.ts @@ -26,6 +26,7 @@ import { } from "../harness/helpers.js"; import { AbsoluteTime, + AmountString, Duration, NotificationType, TransactionMajorState, @@ -77,7 +78,7 @@ export async function runWalletGenDbTest(t: GlobalTestState) { exchangeBaseUrl: exchange.baseUrl, partialContractTerms: { summary: "Hello World", - amount: "TESTKUDOS:5", + amount: "TESTKUDOS:5" as AmountString, purse_expiration: purseExpiration, }, }, diff --git a/packages/taler-harness/src/integrationtests/test-wallettesting.ts b/packages/taler-harness/src/integrationtests/test-wallettesting.ts index e5191aa5b..69637b875 100644 --- a/packages/taler-harness/src/integrationtests/test-wallettesting.ts +++ b/packages/taler-harness/src/integrationtests/test-wallettesting.ts @@ -22,7 +22,7 @@ /** * Imports. */ -import { Amounts, CoinStatus } from "@gnu-taler/taler-util"; +import { AmountString, Amounts, CoinStatus } from "@gnu-taler/taler-util"; import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures.js"; import { @@ -118,8 +118,8 @@ export async function runWallettestingTest(t: GlobalTestState) { const { wallet, bank, exchange, merchant } = await createMyEnvironment(t); await wallet.client.call(WalletApiOperation.RunIntegrationTest, { - amountToSpend: "TESTKUDOS:5", - amountToWithdraw: "TESTKUDOS:10", + amountToSpend: "TESTKUDOS:5" as AmountString, + amountToWithdraw: "TESTKUDOS:10" as AmountString, corebankApiBaseUrl: bank.corebankApiBaseUrl, exchangeBaseUrl: exchange.baseUrl, merchantAuthToken: merchantAuthToken, @@ -142,7 +142,7 @@ export async function runWallettestingTest(t: GlobalTestState) { wallet.deleteDatabase(); await wallet.client.call(WalletApiOperation.WithdrawTestBalance, { - amount: "TESTKUDOS:10", + amount: "TESTKUDOS:10" as AmountString, corebankApiBaseUrl: bank.corebankApiBaseUrl, exchangeBaseUrl: exchange.baseUrl, }); @@ -150,7 +150,7 @@ export async function runWallettestingTest(t: GlobalTestState) { await wallet.runUntilDone(); await wallet.client.call(WalletApiOperation.TestPay, { - amount: "TESTKUDOS:5", + amount: "TESTKUDOS:5" as AmountString, merchantAuthToken: merchantAuthToken, merchantBaseUrl: merchant.makeInstanceBaseUrl(), summary: "foo", @@ -167,7 +167,7 @@ export async function runWallettestingTest(t: GlobalTestState) { wallet.deleteDatabase(); await wallet.client.call(WalletApiOperation.WithdrawTestBalance, { - amount: "TESTKUDOS:10", + amount: "TESTKUDOS:10" as AmountString, corebankApiBaseUrl: bank.corebankApiBaseUrl, exchangeBaseUrl: exchange.baseUrl, }); @@ -203,7 +203,7 @@ export async function runWallettestingTest(t: GlobalTestState) { // to pay. await t.assertThrowsAsync(async () => { await wallet.client.call(WalletApiOperation.TestPay, { - amount: "TESTKUDOS:5", + amount: "TESTKUDOS:5" as AmountString, merchantAuthToken: merchantAuthToken, merchantBaseUrl: merchant.makeInstanceBaseUrl(), summary: "foo", @@ -218,7 +218,7 @@ export async function runWallettestingTest(t: GlobalTestState) { }); await wallet.client.call(WalletApiOperation.TestPay, { - amount: "TESTKUDOS:5", + amount: "TESTKUDOS:5" as AmountString, merchantAuthToken: merchantAuthToken, merchantBaseUrl: merchant.makeInstanceBaseUrl(), summary: "foo", diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-fakebank.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-fakebank.ts index e26d9f964..afce2f776 100644 --- a/packages/taler-harness/src/integrationtests/test-withdrawal-fakebank.ts +++ b/packages/taler-harness/src/integrationtests/test-withdrawal-fakebank.ts @@ -26,7 +26,7 @@ import { } from "../harness/harness.js"; import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures.js"; -import { URL } from "@gnu-taler/taler-util"; +import { AmountString, URL } from "@gnu-taler/taler-util"; /** * Run test for basic, bank-integrated withdrawal. @@ -84,7 +84,7 @@ export async function runWithdrawalFakebankTest(t: GlobalTestState) { await wallet.client.call(WalletApiOperation.WithdrawTestBalance, { corebankApiBaseUrl: bank.corebankApiBaseUrl, exchangeBaseUrl: exchange.baseUrl, - amount: "TESTKUDOS:10", + amount: "TESTKUDOS:10" as AmountString, }); await exchange.runWirewatchOnce(); diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-huge.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-huge.ts index 893d870e5..0ad60bcdd 100644 --- a/packages/taler-harness/src/integrationtests/test-withdrawal-huge.ts +++ b/packages/taler-harness/src/integrationtests/test-withdrawal-huge.ts @@ -28,6 +28,7 @@ import { import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures.js"; import { + AmountString, NotificationType, TransactionMajorState, URL, @@ -101,7 +102,7 @@ export async function runWithdrawalHugeTest(t: GlobalTestState) { // Results in about 1K coins withdrawn await wallet.client.call(WalletApiOperation.WithdrawTestBalance, { exchangeBaseUrl: exchange.baseUrl, - amount: "TESTKUDOS:10000", + amount: "TESTKUDOS:10000" as AmountString, corebankApiBaseUrl: bank.baseUrl, }); diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts index fa483aa28..8ab029acc 100644 --- a/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts +++ b/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts @@ -23,6 +23,7 @@ import { Logger, WireGatewayApiClient, j2s, + AmountString, } from "@gnu-taler/taler-util"; import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; import { GlobalTestState } from "../harness/harness.js"; @@ -60,7 +61,7 @@ export async function runWithdrawalManualTest(t: GlobalTestState) { WalletApiOperation.AcceptManualWithdrawal, { exchangeBaseUrl: exchange.baseUrl, - amount: "TESTKUDOS:10", + amount: "TESTKUDOS:10" as AmountString, }, ); |