commit ebacb4dae0e9f433501364c1fbe61afe96c8b9db
parent a73b3e8464b22191c86544c3db435c2016cace4a
Author: Florian Dold <florian@dold.me>
Date: Wed, 16 Apr 2025 13:42:30 +0200
harness: fix wire gateway API usage in tests
Diffstat:
6 files changed, 66 insertions(+), 48 deletions(-)
diff --git a/packages/taler-harness/src/harness/harness.ts b/packages/taler-harness/src/harness/harness.ts
@@ -60,6 +60,7 @@ import {
openPromise,
parsePaytoUri,
stringToBytes,
+ succeedOrThrow,
} from "@gnu-taler/taler-util";
import {
HttpRequestLibrary,
@@ -2618,14 +2619,16 @@ export async function doMerchantKycAuth(
username: "merchant-default",
payto_uri: kycRespOne.kyc_data[0].payto_uri, //this bank user needs to have the same payto that the exchange is asking from
});
- await wireGatewayApiClient.addKycAuth({
- auth: req.wireGatewayAuth,
- body: {
- amount: "TESTKUDOS:0.1",
- debit_account: kycRespOne.kyc_data[0].payto_uri,
- account_pub: accountPub,
- },
- });
+ succeedOrThrow(
+ await wireGatewayApiClient.addKycAuth({
+ auth: req.wireGatewayAuth,
+ body: {
+ amount: "TESTKUDOS:0.1",
+ debit_account: kycRespOne.kyc_data[0].payto_uri,
+ account_pub: accountPub,
+ },
+ }),
+ );
let kycRespTwo: MerchantAccountKycRedirectsResponse | undefined = undefined;
diff --git a/packages/taler-harness/src/integrationtests/test-kyc-decisions.ts b/packages/taler-harness/src/integrationtests/test-kyc-decisions.ts
@@ -27,6 +27,7 @@ import {
hashNormalizedPaytoUri,
j2s,
LimitOperationType,
+ succeedOrThrow,
TalerProtocolTimestamp,
TalerWireGatewayHttpClient,
TransactionMajorState,
@@ -159,14 +160,16 @@ export async function runKycDecisionsTest(t: GlobalTestState) {
},
});
- await wireGatewayApiClient.addKycAuth({
- auth: exchangeBankAccount.wireGatewayAuth,
- body: {
- amount: "TESTKUDOS:0.1",
- debit_account: merchantPayto,
- account_pub: merchantPair.pub,
- },
- });
+ succeedOrThrow(
+ await wireGatewayApiClient.addKycAuth({
+ auth: exchangeBankAccount.wireGatewayAuth,
+ body: {
+ amount: "TESTKUDOS:0.1",
+ debit_account: merchantPayto,
+ account_pub: merchantPair.pub,
+ },
+ }),
+ );
let checkResp: AccountKycStatus | undefined;
diff --git a/packages/taler-harness/src/integrationtests/test-kyc-deposit-aggregate.ts b/packages/taler-harness/src/integrationtests/test-kyc-deposit-aggregate.ts
@@ -19,6 +19,7 @@
*/
import {
Configuration,
+ succeedOrThrow,
TransactionMajorState,
TransactionMinorState,
TransactionType,
@@ -102,14 +103,16 @@ export async function runKycDepositAggregateTest(t: GlobalTestState) {
t.assertDeepEqual(depositTx.type, TransactionType.Deposit);
- await wireGatewayApi.addKycAuth({
- auth: exchangeBankAccount.wireGatewayAuth,
- body: {
- amount: "TESTKUDOS:0.1",
- debit_account: wres.accountPaytoUri,
- account_pub: depositTx.accountPub,
- },
- });
+ succeedOrThrow(
+ await wireGatewayApi.addKycAuth({
+ auth: exchangeBankAccount.wireGatewayAuth,
+ body: {
+ amount: "TESTKUDOS:0.1",
+ debit_account: wres.accountPaytoUri,
+ account_pub: depositTx.accountPub,
+ },
+ }),
+ );
await exchange.runWirewatchOnce();
diff --git a/packages/taler-harness/src/integrationtests/test-kyc-deposit-deposit-kyctransfer.ts b/packages/taler-harness/src/integrationtests/test-kyc-deposit-deposit-kyctransfer.ts
@@ -21,6 +21,7 @@ import {
Configuration,
Logger,
parsePaytoUri,
+ succeedOrThrow,
TransactionMajorState,
TransactionMinorState,
TransactionType,
@@ -136,14 +137,16 @@ export async function runKycDepositDepositKyctransferTest(t: GlobalTestState) {
logger.info(`account pub: ${kycTx.accountPub}`);
- await wireGatewayApi.addKycAuth({
- auth: exchangeBankAccount.wireGatewayAuth,
- body: {
- amount: "TESTKUDOS:0.1",
- debit_account: depositPaytoUri,
- account_pub: kycTx.accountPub,
- },
- });
+ succeedOrThrow(
+ await wireGatewayApi.addKycAuth({
+ auth: exchangeBankAccount.wireGatewayAuth,
+ body: {
+ amount: "TESTKUDOS:0.1",
+ debit_account: depositPaytoUri,
+ account_pub: kycTx.accountPub,
+ },
+ }),
+ );
}
await walletClient.call(WalletApiOperation.TestingWaitTransactionState, {
diff --git a/packages/taler-harness/src/integrationtests/test-kyc-merchant-activate-bank-account.ts b/packages/taler-harness/src/integrationtests/test-kyc-merchant-activate-bank-account.ts
@@ -24,6 +24,7 @@ import {
Logger,
MerchantAccountKycRedirectsResponse,
parsePaytoUri,
+ succeedOrThrow,
} from "@gnu-taler/taler-util";
import { readSuccessResponseJsonOrThrow } from "@gnu-taler/taler-util/http";
import { createKycTestkudosEnvironment } from "../harness/environments.js";
@@ -114,14 +115,16 @@ export async function runKycMerchantActivateBankAccountTest(
// what looks like a public key from the message.
t.assertDeepEqual(`KYC:${accountPub}`, msgAccountPub);
- await wireGatewayApi.addKycAuth({
- auth: exchangeBankAccount.wireGatewayAuth,
- body: {
- amount: "TESTKUDOS:0.1",
- debit_account: kycRespOne.kyc_data[0].payto_uri,
- account_pub: accountPub,
- },
- });
+ succeedOrThrow(
+ await wireGatewayApi.addKycAuth({
+ auth: exchangeBankAccount.wireGatewayAuth,
+ body: {
+ amount: "TESTKUDOS:0.1",
+ debit_account: kycRespOne.kyc_data[0].payto_uri,
+ account_pub: accountPub,
+ },
+ }),
+ );
let kycRespTwo: MerchantAccountKycRedirectsResponse | undefined = undefined;
diff --git a/packages/taler-harness/src/integrationtests/test-kyc-merchant-deposit.ts b/packages/taler-harness/src/integrationtests/test-kyc-merchant-deposit.ts
@@ -28,6 +28,7 @@ import {
Logger,
MerchantAccountKycRedirectsResponse,
MerchantAccountKycStatus,
+ succeedOrThrow,
TalerMerchantApi,
} from "@gnu-taler/taler-util";
import {
@@ -163,14 +164,16 @@ export async function runKycMerchantDepositTest(t: GlobalTestState) {
username: "merchant-default",
payto_uri: kycRespOne.kyc_data[0].payto_uri, //this bank user needs to have the same payto that the exchange is asking from
});
- await wireGatewayApi.addKycAuth({
- auth: exchangeBankAccount.wireGatewayAuth,
- body: {
- amount: "TESTKUDOS:0.1",
- account_pub: kycRespOne.kyc_data[0].payto_uri,
- debit_account: accountPub,
- },
- });
+ succeedOrThrow(
+ await wireGatewayApi.addKycAuth({
+ auth: exchangeBankAccount.wireGatewayAuth,
+ body: {
+ amount: "TESTKUDOS:0.1",
+ account_pub: accountPub,
+ debit_account: kycRespOne.kyc_data[0].payto_uri,
+ },
+ }),
+ );
let kycRespTwo: MerchantAccountKycRedirectsResponse | undefined = undefined;