[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated: Got first aggregation to pass
From: |
gnunet |
Subject: |
[taler-exchange] branch master updated: Got first aggregation to pass |
Date: |
Thu, 16 Jan 2020 18:50:38 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository exchange.
The following commit(s) were added to refs/heads/master by this push:
new 7321cac3 Got first aggregation to pass
7321cac3 is described below
commit 7321cac34bdc41995652d127dd99f05c34285c38
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Jan 16 18:50:31 2020 +0100
Got first aggregation to pass
---
doc/prebuilt | 2 +-
src/lib/test-taler-exchange-aggregator-postgres.conf | 2 +-
src/lib/test_taler_exchange_aggregator.c | 12 ++++++++++--
src/lib/test_taler_exchange_wirewatch.c | 2 +-
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/doc/prebuilt b/doc/prebuilt
index ca53235c..934a6a18 160000
--- a/doc/prebuilt
+++ b/doc/prebuilt
@@ -1 +1 @@
-Subproject commit ca53235ccfa0458ebf11c204888ca370e20ec3f5
+Subproject commit 934a6a18301e81c4fd1b3a8cda2dc13dca4741cc
diff --git a/src/lib/test-taler-exchange-aggregator-postgres.conf
b/src/lib/test-taler-exchange-aggregator-postgres.conf
index 9ee6c6b0..25ca80fd 100644
--- a/src/lib/test-taler-exchange-aggregator-postgres.conf
+++ b/src/lib/test-taler-exchange-aggregator-postgres.conf
@@ -57,7 +57,7 @@ LEGAL_RESERVE_EXPIRATION_TIME = 7 years
[account-1]
# What is the account URL?
-URL = "payto://x-taler-bank/localhost:8082/3"
+URL = "payto://x-taler-bank/localhost:8082/2"
method = "x-taler-bank"
WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-1.json
ENABLE_DEBIT = YES
diff --git a/src/lib/test_taler_exchange_aggregator.c
b/src/lib/test_taler_exchange_aggregator.c
index 52734a89..2b3634c7 100644
--- a/src/lib/test_taler_exchange_aggregator.c
+++ b/src/lib/test_taler_exchange_aggregator.c
@@ -64,7 +64,7 @@ static struct GNUNET_CRYPTO_RsaPrivateKey *coin_pk;
*/
static struct GNUNET_CRYPTO_RsaPublicKey *coin_pub;
-#define MERCHANT_ACCOUNT "irrelevant-merchant-account-uri"
+#define USER42_ACCOUNT "42"
#if 0
/**
@@ -912,10 +912,18 @@ run (void *cls,
TALER_TESTING_cmd_insert_deposit ("do-deposit-1",
&dbc,
"bob",
- MERCHANT_ACCOUNT, // not relevant
+ USER42_ACCOUNT,
GNUNET_TIME_UNIT_ZERO,
"EUR:1",
"EUR:0.1"),
+ TALER_TESTING_cmd_exec_aggregator ("run-aggregator-on-deposit-1",
+ config_filename),
+
+ TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-1",
+ ec.exchange_url,
+ "EUR:0.89",
+ bc.exchange_payto,
+ bc.user42_payto),
TALER_TESTING_cmd_end ()
};
diff --git a/src/lib/test_taler_exchange_wirewatch.c
b/src/lib/test_taler_exchange_wirewatch.c
index 1327977a..39a222ae 100644
--- a/src/lib/test_taler_exchange_wirewatch.c
+++ b/src/lib/test_taler_exchange_wirewatch.c
@@ -96,7 +96,7 @@ run (void *cls,
5),
TALER_TESTING_cmd_exec_aggregator ("run-aggregator-on-expired-reserve",
config_filename),
- TALER_TESTING_cmd_check_bank_transfer ("check-reserve-expiration-transfer",
+ TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-1",
ec.exchange_url,
"EUR:4.99",
bc.exchange_payto,
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-exchange] branch master updated: Got first aggregation to pass,
gnunet <=