gnunet-svn
[Top][All Lists]
Advanced

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

[taler-wallet-core] 01/02: add integration test for p2p age restrictions


From: gnunet
Subject: [taler-wallet-core] 01/02: add integration test for p2p age restrictions
Date: Mon, 05 Sep 2022 12:55:50 +0200

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

dold pushed a commit to branch master
in repository wallet-core.

commit b1f77f4662e8198d0e02e74d43fd6d1f82ce2fb0
Author: Florian Dold <florian@dold.me>
AuthorDate: Mon Sep 5 12:29:32 2022 +0200

    add integration test for p2p age restrictions
---
 ...ctions.ts => test-age-restrictions-merchant.ts} |  4 +-
 ...strictions.ts => test-age-restrictions-peer.ts} | 72 ++++++----------------
 .../src/integrationtests/testrunner.ts             |  6 +-
 3 files changed, 26 insertions(+), 56 deletions(-)

diff --git 
a/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions.ts 
b/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions-merchant.ts
similarity index 95%
copy from 
packages/taler-wallet-cli/src/integrationtests/test-age-restrictions.ts
copy to 
packages/taler-wallet-cli/src/integrationtests/test-age-restrictions-merchant.ts
index c290fe91..27c36ae4 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions.ts
+++ 
b/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions-merchant.ts
@@ -28,7 +28,7 @@ import {
 /**
  * Run test for basic, bank-integrated withdrawal and payment.
  */
-export async function runAgeRestrictionsTest(t: GlobalTestState) {
+export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) {
   // Set up test environment
 
   const { wallet: walletOne, bank, exchange, merchant } =
@@ -109,4 +109,4 @@ export async function runAgeRestrictionsTest(t: 
GlobalTestState) {
 
 }
 
-runAgeRestrictionsTest.suites = ["wallet"];
+runAgeRestrictionsMerchantTest.suites = ["wallet"];
diff --git 
a/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions.ts 
b/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions-peer.ts
similarity index 56%
rename from 
packages/taler-wallet-cli/src/integrationtests/test-age-restrictions.ts
rename to 
packages/taler-wallet-cli/src/integrationtests/test-age-restrictions-peer.ts
index c290fe91..12e993c3 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions.ts
+++ 
b/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions-peer.ts
@@ -17,6 +17,7 @@
 /**
  * Imports.
  */
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { defaultCoinConfig } from "../harness/denomStructures.js";
 import { GlobalTestState, WalletCli } from "../harness/harness.js";
 import {
@@ -28,17 +29,21 @@ import {
 /**
  * Run test for basic, bank-integrated withdrawal and payment.
  */
-export async function runAgeRestrictionsTest(t: GlobalTestState) {
+export async function runAgeRestrictionsPeerTest(t: GlobalTestState) {
   // Set up test environment
 
-  const { wallet: walletOne, bank, exchange, merchant } =
-    await createSimpleTestkudosEnvironment(
-      t,
-      defaultCoinConfig.map((x) => x("TESTKUDOS")),
-      {
-        ageMaskSpec: "8:10:12:14:16:18:21",
-      },
-    );
+  const {
+    wallet: walletOne,
+    bank,
+    exchange,
+    merchant,
+  } = await createSimpleTestkudosEnvironment(
+    t,
+    defaultCoinConfig.map((x) => x("TESTKUDOS")),
+    {
+      ageMaskSpec: "8:10:12:14:16:18:21",
+    },
+  );
 
   const walletTwo = new WalletCli(t, "walletTwo");
   const walletThree = new WalletCli(t, "walletThree");
@@ -61,52 +66,15 @@ export async function runAgeRestrictionsTest(t: 
GlobalTestState) {
       minimum_age: 9,
     };
 
-    await makeTestPayment(t, { wallet, merchant, order });
-    await wallet.runUntilDone();
-  }
-
-  {
-    const wallet = walletTwo;
-
-    await withdrawViaBank(t, {
-      wallet,
-      bank,
-      exchange,
-      amount: "TESTKUDOS:20",
-      restrictAge: 13,
-    });
-
-    const order = {
-      summary: "Buy me!",
-      amount: "TESTKUDOS:5",
-      fulfillment_url: "taler://fulfillment-success/thx",
-    };
-
-    await makeTestPayment(t, { wallet, merchant, order });
-    await wallet.runUntilDone();
-  }
-
-  {
-    const wallet = walletThree;
-
-    await withdrawViaBank(t, {
-      wallet,
-      bank,
-      exchange,
-      amount: "TESTKUDOS:20",
+    await wallet.client.call(WalletApiOperation.InitiatePeerPushPayment, {
+      amount: "TESTKUDOS:1",
+      partialContractTerms: {
+        summary: "Hello, World",
+      },
     });
 
-    const order = {
-      summary: "Buy me!",
-      amount: "TESTKUDOS:5",
-      fulfillment_url: "taler://fulfillment-success/thx",
-      minimum_age: 9,
-    };
-
-    await makeTestPayment(t, { wallet, merchant, order });
     await wallet.runUntilDone();
   }
-
 }
 
-runAgeRestrictionsTest.suites = ["wallet"];
+runAgeRestrictionsPeerTest.suites = ["wallet"];
diff --git a/packages/taler-wallet-cli/src/integrationtests/testrunner.ts 
b/packages/taler-wallet-cli/src/integrationtests/testrunner.ts
index 69905730..de6e246d 100644
--- a/packages/taler-wallet-cli/src/integrationtests/testrunner.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/testrunner.ts
@@ -25,7 +25,7 @@ import {
   shouldLingerInTest,
   TestRunResult,
 } from "../harness/harness.js";
-import { runAgeRestrictionsTest } from "./test-age-restrictions.js";
+import { runAgeRestrictionsMerchantTest } from 
"./test-age-restrictions-merchant.js";
 import { runBankApiTest } from "./test-bank-api.js";
 import { runClaimLoopTest } from "./test-claim-loop.js";
 import { runClauseSchnorrTest } from "./test-clause-schnorr.js";
@@ -90,6 +90,7 @@ import { runWithdrawalAbortBankTest } from 
"./test-withdrawal-abort-bank.js";
 import { runWithdrawalBankIntegratedTest } from 
"./test-withdrawal-bank-integrated.js";
 import { runWithdrawalFakebankTest } from "./test-withdrawal-fakebank.js";
 import { runTestWithdrawalManualTest } from "./test-withdrawal-manual.js";
+import { runAgeRestrictionsPeerTest } from "./test-age-restrictions-peer.js";
 
 /**
  * Test runner.
@@ -106,7 +107,8 @@ interface TestMainFunction {
 }
 
 const allTests: TestMainFunction[] = [
-  runAgeRestrictionsTest,
+  runAgeRestrictionsMerchantTest,
+  runAgeRestrictionsPeerTest,
   runBankApiTest,
   runClaimLoopTest,
   runClauseSchnorrTest,

-- 
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]