gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-wallet-core] branch master updated (d8c4b273 -> a98a7cd0)


From: gnunet
Subject: [taler-wallet-core] branch master updated (d8c4b273 -> a98a7cd0)
Date: Wed, 03 Feb 2021 14:36:11 +0100

This is an automated email from the git hooks/post-receive script.

ms pushed a change to branch master
in repository wallet-core.

    from d8c4b273 libeufin tutorial test skeleton
     new a3b84dca libeufin tutorial test: check sandbox step
     new a98a7cd0 prettified sources

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 packages/taler-wallet-cli/src/index.ts             |  5 +++-
 .../src/integrationtests/harness.ts                |  2 ++
 .../src/integrationtests/libeufin.ts               | 27 ++++++++++++++++++++++
 .../src/integrationtests/merchantApiTypes.ts       | 16 ++++---------
 .../src/integrationtests/test-deposit.ts           |  7 ++----
 .../src/integrationtests/test-libeufin-basic.ts    | 12 +++++-----
 .../src/integrationtests/test-libeufin-tutorial.ts | 14 +++++++----
 .../integrationtests/test-merchant-refund-api.ts   |  6 ++++-
 .../src/integrationtests/test-pay-abort.ts         | 11 +++++++--
 .../src/integrationtests/test-payment-claim.ts     |  5 +++-
 .../integrationtests/test-refund-incremental.ts    |  6 ++++-
 .../integrationtests/test-withdrawal-abort-bank.ts |  5 +++-
 .../src/integrationtests/testrunner.ts             |  7 +++++-
 13 files changed, 88 insertions(+), 35 deletions(-)

diff --git a/packages/taler-wallet-cli/src/index.ts 
b/packages/taler-wallet-cli/src/index.ts
index e97e8de8..5e0d7220 100644
--- a/packages/taler-wallet-cli/src/index.ts
+++ b/packages/taler-wallet-cli/src/index.ts
@@ -45,7 +45,10 @@ import { getTestInfo, runTests } from 
"./integrationtests/testrunner";
 
 // This module also serves as the entry point for the crypto
 // thread worker, and thus must expose these two handlers.
-export { handleWorkerError, handleWorkerMessage } from 
"@gnu-taler/taler-wallet-core";
+export {
+  handleWorkerError,
+  handleWorkerMessage,
+} from "@gnu-taler/taler-wallet-core";
 
 const logger = new Logger("taler-wallet-cli.ts");
 
diff --git a/packages/taler-wallet-cli/src/integrationtests/harness.ts 
b/packages/taler-wallet-cli/src/integrationtests/harness.ts
index 5c29d164..bd950da0 100644
--- a/packages/taler-wallet-cli/src/integrationtests/harness.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/harness.ts
@@ -136,6 +136,7 @@ export async function sh(
   t: GlobalTestState,
   logName: string,
   command: string,
+  env: { [index: string]: string | undefined } = process.env,
 ): Promise<string> {
   console.log("runing command", command);
   return new Promise((resolve, reject) => {
@@ -143,6 +144,7 @@ export async function sh(
     const proc = spawn(command, {
       stdio: ["inherit", "pipe", "pipe"],
       shell: true,
+      env: env,
     });
     proc.stdout.on("data", (x) => {
       if (x instanceof Buffer) {
diff --git a/packages/taler-wallet-cli/src/integrationtests/libeufin.ts 
b/packages/taler-wallet-cli/src/integrationtests/libeufin.ts
index 971505cb..486837e9 100644
--- a/packages/taler-wallet-cli/src/integrationtests/libeufin.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/libeufin.ts
@@ -25,6 +25,7 @@ import {
   ProcessWrapper,
   runCommand,
   extendEnv,
+  sh,
 } from "./harness";
 
 export interface LibeufinSandboxServiceInterface {
@@ -45,6 +46,13 @@ export interface LibeufinNexusConfig {
   databaseJdbcUri: string;
 }
 
+export interface LibeufinCliDetails {
+  nexusUrl: string;
+  sandboxUrl: string;
+  nexusDatabaseUri: string;
+  sandboxDatabaseUri: string;
+}
+
 export class LibeufinSandboxService implements LibeufinSandboxServiceInterface 
{
   static async create(
     gc: GlobalTestState,
@@ -171,6 +179,25 @@ export interface SimulateIncomingTransactionRequest {
   currency: string;
 }
 
+export class LibeufinCli {
+  cliDetails: LibeufinCliDetails;
+  globalTestState: GlobalTestState;
+
+  constructor(gc: GlobalTestState, cd: LibeufinCliDetails) {
+    this.globalTestState = gc;
+    this.cliDetails = cd;
+  }
+
+  async checkSandbox(): Promise<void> {
+    await sh(
+      this.globalTestState,
+      "libeufin-cli-checksandbox",
+      "libeufin-cli sandbox check",
+      extendEnv({ LIBEUFIN_SANDBOX_URL: this.cliDetails.sandboxUrl }),
+    );
+  }
+}
+
 export namespace LibeufinSandboxApi {
   export async function createEbicsHost(
     libeufinSandboxService: LibeufinSandboxServiceInterface,
diff --git a/packages/taler-wallet-cli/src/integrationtests/merchantApiTypes.ts 
b/packages/taler-wallet-cli/src/integrationtests/merchantApiTypes.ts
index 85a3106c..a6356b31 100644
--- a/packages/taler-wallet-cli/src/integrationtests/merchantApiTypes.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/merchantApiTypes.ts
@@ -78,9 +78,7 @@ export const codecForPostOrderResponse = (): 
Codec<PostOrderResponse> =>
     .property("token", codecOptional(codecForString()))
     .build("PostOrderResponse");
 
-export const codecForCheckPaymentPaidResponse = (): Codec<
-  CheckPaymentPaidResponse
-> =>
+export const codecForCheckPaymentPaidResponse = (): 
Codec<CheckPaymentPaidResponse> =>
   buildCodecForObject<CheckPaymentPaidResponse>()
     .property("order_status_url", codecForString())
     .property("order_status", codecForConstString("paid"))
@@ -97,9 +95,7 @@ export const codecForCheckPaymentPaidResponse = (): Codec<
     .property("refund_details", codecForAny())
     .build("CheckPaymentPaidResponse");
 
-export const codecForCheckPaymentUnpaidResponse = (): Codec<
-  CheckPaymentUnpaidResponse
-> =>
+export const codecForCheckPaymentUnpaidResponse = (): 
Codec<CheckPaymentUnpaidResponse> =>
   buildCodecForObject<CheckPaymentUnpaidResponse>()
     .property("order_status", codecForConstString("unpaid"))
     .property("taler_pay_uri", codecForString())
@@ -107,17 +103,13 @@ export const codecForCheckPaymentUnpaidResponse = (): 
Codec<
     .property("already_paid_order_id", codecOptional(codecForString()))
     .build("CheckPaymentPaidResponse");
 
-export const codecForCheckPaymentClaimedResponse = (): Codec<
-  CheckPaymentClaimedResponse
-> =>
+export const codecForCheckPaymentClaimedResponse = (): 
Codec<CheckPaymentClaimedResponse> =>
   buildCodecForObject<CheckPaymentClaimedResponse>()
     .property("order_status", codecForConstString("claimed"))
     .property("contract_terms", codecForContractTerms())
     .build("CheckPaymentClaimedResponse");
 
-export const codecForMerchantOrderPrivateStatusResponse = (): Codec<
-  MerchantOrderPrivateStatusResponse
-> =>
+export const codecForMerchantOrderPrivateStatusResponse = (): 
Codec<MerchantOrderPrivateStatusResponse> =>
   buildCodecForUnion<MerchantOrderPrivateStatusResponse>()
     .discriminateOn("order_status")
     .alternative("paid", codecForCheckPaymentPaidResponse())
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-deposit.ts 
b/packages/taler-wallet-cli/src/integrationtests/test-deposit.ts
index 3e59a6cc..905cf8af 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-deposit.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-deposit.ts
@@ -18,10 +18,7 @@
  * Imports.
  */
 import { GlobalTestState } from "./harness";
-import {
-  createSimpleTestkudosEnvironment,
-  withdrawViaBank,
-} from "./helpers";
+import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers";
 
 /**
  * Run test for basic, bank-integrated withdrawal and payment.
@@ -59,7 +56,7 @@ export async function runDepositTest(t: GlobalTestState) {
 
   const trackResult = wallet.trackDepositGroup({
     depositGroupId,
-  })
+  });
 
   console.log(JSON.stringify(trackResult, undefined, 2));
 }
diff --git 
a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts 
b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts
index 44cdf6c0..609ec596 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts
@@ -148,23 +148,23 @@ export async function createLibeufinTestEnvironment(
   await LibeufinNexusApi.postPermission(libeufinNexus, {
     action: "grant",
     permission: {
-      subjectType: "user", 
+      subjectType: "user",
       subjectId: "twguser",
       resourceType: "facade",
       resourceId: "twg1",
-      permissionName: "facade.talerWireGateway.history"
-    }
+      permissionName: "facade.talerWireGateway.history",
+    },
   });
 
   await LibeufinNexusApi.postPermission(libeufinNexus, {
     action: "grant",
     permission: {
-      subjectType: "user", 
+      subjectType: "user",
       subjectId: "twguser",
       resourceType: "facade",
       resourceId: "twg1",
-      permissionName: "facade.talerWireGateway.transfer"
-    }
+      permissionName: "facade.talerWireGateway.transfer",
+    },
   });
 
   const exchange = ExchangeService.create(t, {
diff --git 
a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-tutorial.ts 
b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-tutorial.ts
index 817bfad8..dce5e886 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-tutorial.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-tutorial.ts
@@ -19,17 +19,15 @@
  */
 import { CoreApiResponse } from "@gnu-taler/taler-wallet-core";
 import { CoinConfig, defaultCoinConfig } from "./denomStructures";
-import {
-  GlobalTestState,
-} from "./harness";
+import { GlobalTestState } from "./harness";
 import {
   LibeufinNexusApi,
   LibeufinNexusService,
   LibeufinSandboxApi,
   LibeufinSandboxService,
+  LibeufinCli,
 } from "./libeufin";
 
-
 /**
  * Run basic test with LibEuFin.
  */
@@ -52,4 +50,12 @@ export async function runLibeufinTutorialTest(t: 
GlobalTestState) {
   await libeufinNexus.start();
   await libeufinNexus.pingUntilAvailable();
 
+  const libeufinCli = new LibeufinCli(t, {
+    sandboxUrl: libeufinSandbox.baseUrl,
+    nexusUrl: libeufinNexus.baseUrl,
+    sandboxDatabaseUri: `jdbc:sqlite:${t.testDir}/libeufin-sandbox.sqlite3`,
+    nexusDatabaseUri: `jdbc:sqlite:${t.testDir}/libeufin-nexus.sqlite3`,
+  });
+
+  await libeufinCli.checkSandbox();
 }
diff --git 
a/packages/taler-wallet-cli/src/integrationtests/test-merchant-refund-api.ts 
b/packages/taler-wallet-cli/src/integrationtests/test-merchant-refund-api.ts
index d3359785..07ed5639 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-merchant-refund-api.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-merchant-refund-api.ts
@@ -30,7 +30,11 @@ import {
   withdrawViaBank,
   SimpleTestEnvironment,
 } from "./helpers";
-import { durationFromSpec, PreparePayResultType, URL } from 
"@gnu-taler/taler-wallet-core";
+import {
+  durationFromSpec,
+  PreparePayResultType,
+  URL,
+} from "@gnu-taler/taler-wallet-core";
 import axios from "axios";
 
 async function testRefundApiWithFulfillmentUrl(
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-pay-abort.ts 
b/packages/taler-wallet-cli/src/integrationtests/test-pay-abort.ts
index 7102c11c..90a0edf0 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-pay-abort.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-pay-abort.ts
@@ -22,8 +22,15 @@
 /**
  * Imports.
  */
-import { PreparePayResultType, TalerErrorCode, URL } from 
"@gnu-taler/taler-wallet-core";
-import { FaultInjectionRequestContext, FaultInjectionResponseContext } from 
"./faultInjection";
+import {
+  PreparePayResultType,
+  TalerErrorCode,
+  URL,
+} from "@gnu-taler/taler-wallet-core";
+import {
+  FaultInjectionRequestContext,
+  FaultInjectionResponseContext,
+} from "./faultInjection";
 import { GlobalTestState, MerchantPrivateApi, setupDb } from "./harness";
 import {
   createFaultInjectedMerchantTestkudosEnvironment,
diff --git 
a/packages/taler-wallet-cli/src/integrationtests/test-payment-claim.ts 
b/packages/taler-wallet-cli/src/integrationtests/test-payment-claim.ts
index 173fdfa3..2432c111 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-payment-claim.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-payment-claim.ts
@@ -19,7 +19,10 @@
  */
 import { GlobalTestState, MerchantPrivateApi, WalletCli } from "./harness";
 import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers";
-import { PreparePayResultType, TalerErrorCode } from 
"@gnu-taler/taler-wallet-core";
+import {
+  PreparePayResultType,
+  TalerErrorCode,
+} from "@gnu-taler/taler-wallet-core";
 
 /**
  * Run test for basic, bank-integrated withdrawal.
diff --git 
a/packages/taler-wallet-cli/src/integrationtests/test-refund-incremental.ts 
b/packages/taler-wallet-cli/src/integrationtests/test-refund-incremental.ts
index 1595c8b8..69d50326 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-refund-incremental.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-refund-incremental.ts
@@ -19,7 +19,11 @@
  */
 import { GlobalTestState, delayMs, MerchantPrivateApi } from "./harness";
 import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers";
-import { TransactionType, Amounts, durationFromSpec } from 
"@gnu-taler/taler-wallet-core";
+import {
+  TransactionType,
+  Amounts,
+  durationFromSpec,
+} from "@gnu-taler/taler-wallet-core";
 
 /**
  * Run test for basic, bank-integrated withdrawal.
diff --git 
a/packages/taler-wallet-cli/src/integrationtests/test-withdrawal-abort-bank.ts 
b/packages/taler-wallet-cli/src/integrationtests/test-withdrawal-abort-bank.ts
index d579ee11..861e616e 100644
--- 
a/packages/taler-wallet-cli/src/integrationtests/test-withdrawal-abort-bank.ts
+++ 
b/packages/taler-wallet-cli/src/integrationtests/test-withdrawal-abort-bank.ts
@@ -19,7 +19,10 @@
  */
 import { GlobalTestState, BankApi, BankAccessApi } from "./harness";
 import { createSimpleTestkudosEnvironment } from "./helpers";
-import { codecForBalancesResponse, TalerErrorCode } from 
"@gnu-taler/taler-wallet-core";
+import {
+  codecForBalancesResponse,
+  TalerErrorCode,
+} from "@gnu-taler/taler-wallet-core";
 
 /**
  * Run test for basic, bank-integrated withdrawal.
diff --git a/packages/taler-wallet-cli/src/integrationtests/testrunner.ts 
b/packages/taler-wallet-cli/src/integrationtests/testrunner.ts
index dd2cb69b..e820ac25 100644
--- a/packages/taler-wallet-cli/src/integrationtests/testrunner.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/testrunner.ts
@@ -14,7 +14,12 @@
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
-import { GlobalTestState, runTestWithState, shouldLingerInTest, TestRunResult 
} from "./harness";
+import {
+  GlobalTestState,
+  runTestWithState,
+  shouldLingerInTest,
+  TestRunResult,
+} from "./harness";
 import { runPaymentTest } from "./test-payment";
 import * as fs from "fs";
 import * as path from "path";

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]