summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2021-11-24 01:57:11 +0100
committerFlorian Dold <florian@dold.me>2021-11-24 01:57:11 +0100
commit7fac3bd17d2c3e4c74cf57aab976e704aa0d653e (patch)
treead52e2668effc1eb52703eafa31ff6d89d8cd214
parentae8af3f27c0ed1746c49a7608fe05af24ae8a18b (diff)
downloadwallet-core-7fac3bd17d2c3e4c74cf57aab976e704aa0d653e.tar.gz
wallet-core-7fac3bd17d2c3e4c74cf57aab976e704aa0d653e.tar.bz2
wallet-core-7fac3bd17d2c3e4c74cf57aab976e704aa0d653e.zip
logging / explicit wire deadline
-rw-r--r--packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts10
-rw-r--r--packages/taler-wallet-cli/src/integrationtests/test-refund-gone.ts2
-rw-r--r--packages/taler-wallet-core/src/operations/refresh.ts2
-rw-r--r--packages/taler-wallet-core/src/util/contractTerms.ts1
4 files changed, 10 insertions, 5 deletions
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 6133bcc19..3f7e1a9d1 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts
@@ -17,7 +17,12 @@
/**
* Imports.
*/
-import { CoreApiResponse } from "@gnu-taler/taler-util";
+import {
+ ContractTerms,
+ CoreApiResponse,
+ getTimestampNow,
+ timestampTruncateToSecond,
+} from "@gnu-taler/taler-util";
import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures";
import {
@@ -272,10 +277,11 @@ export async function runLibeufinBasicTest(t: GlobalTestState) {
console.log("balances", JSON.stringify(bal, undefined, 2));
t.assertAmountEquals(bal.balances[0].available, "EUR:14.7");
- const order = {
+ const order: Partial<ContractTerms> = {
summary: "Buy me!",
amount: "EUR:5",
fulfillment_url: "taler://fulfillment-success/thx",
+ wire_transfer_deadline: timestampTruncateToSecond(getTimestampNow()),
};
await makeTestPayment(t, { wallet, merchant, order });
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-refund-gone.ts b/packages/taler-wallet-cli/src/integrationtests/test-refund-gone.ts
index acb74b3d3..c6442a240 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-refund-gone.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-refund-gone.ts
@@ -110,8 +110,8 @@ export async function runRefundGoneTest(t: GlobalTestState) {
talerRefundUri: ref.talerRefundUri,
});
+ console.log("refund response:", rr);
t.assertAmountEquals(rr.amountRefundGone, "TESTKUDOS:5");
- console.log(rr);
await wallet.runUntilDone();
diff --git a/packages/taler-wallet-core/src/operations/refresh.ts b/packages/taler-wallet-core/src/operations/refresh.ts
index 956e4d65a..c1e672d63 100644
--- a/packages/taler-wallet-core/src/operations/refresh.ts
+++ b/packages/taler-wallet-core/src/operations/refresh.ts
@@ -897,7 +897,7 @@ export async function createRefreshGroup(
logger.trace(`created refresh group ${refreshGroupId}`);
processRefreshGroup(ws, refreshGroupId).catch((e) => {
- logger.warn(`processing refresh group ${refreshGroupId} failed`);
+ logger.warn(`processing refresh group ${refreshGroupId} failed: ${e}`);
});
return {
diff --git a/packages/taler-wallet-core/src/util/contractTerms.ts b/packages/taler-wallet-core/src/util/contractTerms.ts
index b064079e9..c2f1ba075 100644
--- a/packages/taler-wallet-core/src/util/contractTerms.ts
+++ b/packages/taler-wallet-core/src/util/contractTerms.ts
@@ -225,7 +225,6 @@ export namespace ContractTermsUtil {
const cleaned = scrub(contractTerms);
const canon = canonicalJson(cleaned) + "\0";
const bytes = stringToBytes(canon);
- logger.info(`contract terms before hashing: ${encodeCrock(bytes)}`);
return encodeCrock(hash(bytes));
}
}