summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2020-01-16 18:50:31 +0100
committerMarcello Stanisci <stanisci.m@gmail.com>2020-01-16 18:50:31 +0100
commit7321cac34bdc41995652d127dd99f05c34285c38 (patch)
tree1d28504dac71200a1bbbd82df3443268a8472977 /src
parent1e26fc824c5e12460159e203db7fd686ab6b8bd9 (diff)
downloadexchange-7321cac34bdc41995652d127dd99f05c34285c38.tar.gz
exchange-7321cac34bdc41995652d127dd99f05c34285c38.tar.bz2
exchange-7321cac34bdc41995652d127dd99f05c34285c38.zip
Got first aggregation to pass
Diffstat (limited to 'src')
-rw-r--r--src/lib/test-taler-exchange-aggregator-postgres.conf2
-rw-r--r--src/lib/test_taler_exchange_aggregator.c12
-rw-r--r--src/lib/test_taler_exchange_wirewatch.c2
3 files changed, 12 insertions, 4 deletions
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,