From e075134ffc94fda3582b179122bda594d91a962b Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Sat, 15 Oct 2022 11:52:07 +0200
Subject: wallet-core: simplify coin record

we only track the allocation now, not the remaining amount
---
 packages/taler-wallet-cli/src/index.ts                           | 4 +---
 .../src/integrationtests/test-refund-incremental.ts              | 2 +-
 .../taler-wallet-cli/src/integrationtests/test-wallettesting.ts  | 9 ++++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

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

diff --git a/packages/taler-wallet-cli/src/index.ts b/packages/taler-wallet-cli/src/index.ts
index 941a2f28f..b3abbac6f 100644
--- a/packages/taler-wallet-cli/src/index.ts
+++ b/packages/taler-wallet-cli/src/index.ts
@@ -1105,9 +1105,7 @@ advancedCli
         console.log(`coin ${coin.coin_pub}`);
         console.log(` exchange ${coin.exchange_base_url}`);
         console.log(` denomPubHash ${coin.denom_pub_hash}`);
-        console.log(
-          ` remaining amount ${Amounts.stringify(coin.remaining_value)}`,
-        );
+        console.log(` status ${coin.coin_status}`);
       }
     });
   });
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 e4e96a180..8d1f6e873 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-refund-incremental.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-refund-incremental.ts
@@ -193,7 +193,7 @@ export async function runRefundIncrementalTest(t: GlobalTestState) {
         .map((x) => x.amountEffective),
     ).amount;
 
-    t.assertAmountEquals("TESTKUDOS:8.33", effective);
+    t.assertAmountEquals("TESTKUDOS:8.59", effective);
   }
 
   await t.shutdown();
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-wallettesting.ts b/packages/taler-wallet-cli/src/integrationtests/test-wallettesting.ts
index c16a85f19..03c446db3 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-wallettesting.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-wallettesting.ts
@@ -22,7 +22,7 @@
 /**
  * Imports.
  */
-import { Amounts } from "@gnu-taler/taler-util";
+import { Amounts, CoinStatus } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures.js";
 import {
@@ -32,7 +32,7 @@ import {
   MerchantService,
   setupDb,
   WalletCli,
-  getPayto
+  getPayto,
 } from "../harness/harness.js";
 import { SimpleTestEnvironment } from "../harness/helpers.js";
 
@@ -184,7 +184,10 @@ export async function runWallettestingTest(t: GlobalTestState) {
   let susp: string | undefined;
   {
     for (const c of coinDump.coins) {
-      if (0 === Amounts.cmp(c.remaining_value, "TESTKUDOS:8")) {
+      if (
+        c.coin_status === CoinStatus.Fresh &&
+        0 === Amounts.cmp(c.denom_value, "TESTKUDOS:8")
+      ) {
         susp = c.coin_pub;
       }
     }
-- 
cgit v1.2.3