From d32d2895cedad656d7130522722f40642c439de6 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Wed, 24 Aug 2022 11:11:02 +0200
Subject: -get p2p pull integration test to run through

---
 packages/taler-wallet-cli/src/harness/harness.ts             |  4 +++-
 packages/taler-wallet-cli/src/index.ts                       | 12 +++++++-----
 .../src/integrationtests/test-peer-to-peer-pull.ts           |  7 +++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'packages/taler-wallet-cli/src')

diff --git a/packages/taler-wallet-cli/src/harness/harness.ts b/packages/taler-wallet-cli/src/harness/harness.ts
index 51f0ce649..aa58fa7a4 100644
--- a/packages/taler-wallet-cli/src/harness/harness.ts
+++ b/packages/taler-wallet-cli/src/harness/harness.ts
@@ -1940,7 +1940,7 @@ export class WalletCli {
           `wallet-${self.name}`,
           `taler-wallet-cli ${
             self.timetravelArg ?? ""
-          } --no-throttle -LTRACE --wallet-db '${
+          } --no-throttle -LTRACE --skip-defaults --wallet-db '${
             self.dbfile
           }' api '${op}' ${shellWrap(JSON.stringify(payload))}`,
         );
@@ -1990,6 +1990,7 @@ export class WalletCli {
         "--no-throttle",
         ...this.timetravelArgArr,
         "-LTRACE",
+        "--skip-defaults",
         "--wallet-db",
         this.dbfile,
         "run-until-done",
@@ -2005,6 +2006,7 @@ export class WalletCli {
       "taler-wallet-cli",
       [
         "--no-throttle",
+        "--skip-defaults",
         "-LTRACE",
         ...this.timetravelArgArr,
         "--wallet-db",
diff --git a/packages/taler-wallet-cli/src/index.ts b/packages/taler-wallet-cli/src/index.ts
index a1073dc31..aedc2146e 100644
--- a/packages/taler-wallet-cli/src/index.ts
+++ b/packages/taler-wallet-cli/src/index.ts
@@ -197,6 +197,9 @@ export const walletCli = clk
   })
   .flag("verbose", ["-V", "--verbose"], {
     help: "Enable verbose output.",
+  })
+  .flag("skipDefaults", ["--skip-defaults"], {
+    help: "Skip configuring default exchanges.",
   });
 
 type WalletCliArgsType = clk.GetArgType<typeof walletCli>;
@@ -233,7 +236,9 @@ async function withWallet<T>(
       ws: wallet,
       client: wallet.client,
     };
-    await wallet.handleCoreApiRequest("initWallet", "native-init", {});
+    await wallet.handleCoreApiRequest("initWallet", "native-init", {
+      skipDefaults: walletCliArgs.wallet.skipDefaults,
+    });
     const ret = await f(w);
     return ret;
   } catch (e) {
@@ -1159,10 +1164,7 @@ testCli
 
       const salt = getRandomBytes(32);
       tDerive.start();
-      const deriv = await AgeRestriction.commitmentDerive(
-        commitProof,
-        salt,
-      );
+      const deriv = await AgeRestriction.commitmentDerive(commitProof, salt);
       tDerive.stop();
 
       tCompare.start();
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-peer-to-peer-pull.ts b/packages/taler-wallet-cli/src/integrationtests/test-peer-to-peer-pull.ts
index e78bd5a29..1be1563ce 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-peer-to-peer-pull.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-peer-to-peer-pull.ts
@@ -17,6 +17,7 @@
 /**
  * Imports.
  */
+import { j2s } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { GlobalTestState } from "../harness/harness.js";
 import {
@@ -57,6 +58,8 @@ export async function runPeerToPeerPullTest(t: GlobalTestState) {
     },
   );
 
+  console.log(`checkResp: ${j2s(checkResp)}`);
+
   const acceptResp = await wallet.client.call(
     WalletApiOperation.AcceptPeerPullPayment,
     {
@@ -64,6 +67,10 @@ export async function runPeerToPeerPullTest(t: GlobalTestState) {
     },
   );
 
+  const txs = await wallet.client.call(WalletApiOperation.GetTransactions, {});
+
+  console.log(`transactions: ${j2s(txs)}`);
+
   await wallet.runUntilDone();
 }
 
-- 
cgit v1.2.3