taler-typescript-core

commit a314508d92884f20890987f3161d5a245708e931
parent ec8013f623ed33eb8962a1d3739d78f0d7c4f784
Author: Florian Dold <florian@dold.me>
Date:   Wed, 16 Apr 2025 14:25:55 +0200

harness: use -t for taler-merchant-kyccheck in kyc-merchant-deposit-rewrite

Diffstat:
M
packages/taler-harness/src/harness/harness.ts
 | 
9
+++++++++
M
packages/taler-harness/src/integrationtests/test-denom-unoffered.ts
 | 
6
++++++
M
packages/taler-harness/src/integrationtests/test-kyc-merchant-deposit-rewrite.ts
 | 
9
++++++++-

3 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/packages/taler-harness/src/harness/harness.ts b/packages/taler-harness/src/harness/harness.ts
@@ -1922,6 +1922,15 @@ export class MerchantService implements MerchantServiceInterface {
     );
   }
 
+  async runKyccheckOnce() {
+    await runCommand(
+      this.globalState,
+      `merchant-${this.name}-kyccheck-once`,
+      "taler-merchant-kyccheck",
+      [...this.timetravelArgArr, "-LINFO", "-c", this.configFilename, "-t"],
+    );
+  }
+
   /**
    * Start the merchant.
    * Waits for the service to become fully available.
diff --git a/packages/taler-harness/src/integrationtests/test-denom-unoffered.ts b/packages/taler-harness/src/integrationtests/test-denom-unoffered.ts
@@ -18,6 +18,8 @@
  * Imports.
  */
 import {
+  j2s,
+  Logger,
   PreparePayResultType,
   succeedOrThrow,
   TalerErrorCode,
@@ -32,6 +34,8 @@ import {
 } from "../harness/environments.js";
 import { GlobalTestState } from "../harness/harness.js";
 
+const logger = new Logger("test-denom-unoffered");
+
 export async function runDenomUnofferedTest(t: GlobalTestState) {
   // Set up test environment
 
@@ -112,6 +116,8 @@ export async function runDenomUnofferedTest(t: GlobalTestState) {
     tx.error.code === TalerErrorCode.WALLET_PAY_MERCHANT_SERVER_ERROR,
   );
 
+  logger.info(`tx error: ${j2s(tx.error)}`);
+
   const merchantErrorCode = (tx.error as any).requestError.errorResponse.code;
 
   switch (merchantErrorCode) {
diff --git a/packages/taler-harness/src/integrationtests/test-kyc-merchant-deposit-rewrite.ts b/packages/taler-harness/src/integrationtests/test-kyc-merchant-deposit-rewrite.ts
@@ -27,7 +27,6 @@ import {
   MerchantAccountKycRedirectsResponse,
   MerchantAccountKycStatus,
   succeedOrThrow,
-  TalerMerchantApi,
 } from "@gnu-taler/taler-util";
 import {
   configureCommonKyc,
@@ -90,6 +89,11 @@ async function retryUntil<T, X extends T>(
   return x as X;
 }
 
+/**
+ * Alternate version of the kyc-merchant-deposit test.
+ *
+ * This test invokes kyccheck in test mode instead of creating an order.
+ */
 export async function runKycMerchantDepositRewriteTest(t: GlobalTestState) {
   // Set up test environment
 
@@ -110,6 +114,7 @@ export async function runKycMerchantDepositRewriteTest(t: GlobalTestState) {
   {
     const kycStatus = await retryUntil(
       async () => {
+        await merchant.runKyccheckOnce();
         await merchant.runDepositcheckOnce();
         return succeedOrThrow<MerchantAccountKycRedirectsResponse | void>(
           await merchantApi.getCurrentInstanceKycStatus(undefined),
@@ -184,6 +189,7 @@ export async function runKycMerchantDepositRewriteTest(t: GlobalTestState) {
   {
     const kycStatus = await retryUntil(
       async () => {
+        await merchant.runKyccheckOnce();
         await merchant.runDepositcheckOnce();
         return succeedOrThrow<MerchantAccountKycRedirectsResponse | void>(
           await merchantApi.getCurrentInstanceKycStatus(undefined),
@@ -234,6 +240,7 @@ export async function runKycMerchantDepositRewriteTest(t: GlobalTestState) {
   {
     const kycStatus = await retryUntil(
       async () => {
+        await merchant.runKyccheckOnce();
         await merchant.runDepositcheckOnce();
         // Now we can check the status
         return succeedOrThrow<MerchantAccountKycRedirectsResponse | void>(