-fix #7262
This commit is contained in:
parent
bad572a010
commit
007e4bc954
@ -1 +1 @@
|
||||
1655124520
|
||||
1655640402
|
||||
|
@ -113,7 +113,7 @@ currency = TESTKUDOS
|
||||
[merchant-exchange-default]
|
||||
CURRENCY = TESTKUDOS
|
||||
EXCHANGE_BASE_URL = http://localhost:8081/
|
||||
MASTER_KEY = GPB1CSPV6E49MET2PX6BFWVBGFF8BAE14M05RJB54C28EY1HX42G
|
||||
MASTER_KEY = JM0NJXHM6Y6HYAPK2WDFH3HDJ2E9KZWGKM3E0FYRV2V3HCTB3DQ0
|
||||
|
||||
[merchant-account-merchant]
|
||||
ACTIVE_default = YES
|
||||
@ -157,7 +157,7 @@ CONFIG = postgres:///auditor-basedb
|
||||
[exchange]
|
||||
LOOKAHEAD_SIGN = 32 weeks 1 day
|
||||
SIGNKEY_DURATION = 4 weeks
|
||||
MASTER_PUBLIC_KEY = GPB1CSPV6E49MET2PX6BFWVBGFF8BAE14M05RJB54C28EY1HX42G
|
||||
MASTER_PUBLIC_KEY = JM0NJXHM6Y6HYAPK2WDFH3HDJ2E9KZWGKM3E0FYRV2V3HCTB3DQ0
|
||||
SIGNKEY_LEGAL_DURATION = 4 weeks
|
||||
UNIXPATH = ${TALER_RUNTIME_DIR}/exchange.http
|
||||
|
||||
@ -175,7 +175,7 @@ DATABASE = postgres:///auditor-basedb
|
||||
CONFIG = postgres:///auditor-basedb
|
||||
|
||||
[auditor]
|
||||
PUBLIC_KEY = FBVV6V14GCCR95X2W2PMCBTFYZ4S3SX3JN504M8SJTMK1JBBV99G
|
||||
PUBLIC_KEY = 73NJKBP4MHJF8274K88F4WFWKNYMK8T6MTSE6HHYS6WC01H9YH7G
|
||||
TINY_AMOUNT = TESTKUDOS:0.01
|
||||
BASE_URL = http://localhost:8083/
|
||||
|
||||
|
@ -1 +1 @@
|
||||
GPB1CSPV6E49MET2PX6BFWVBGFF8BAE14M05RJB54C28EY1HX42G
|
||||
JM0NJXHM6Y6HYAPK2WDFH3HDJ2E9KZWGKM3E0FYRV2V3HCTB3DQ0
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1 +1 @@
|
||||
1655124599
|
||||
1655640625
|
||||
|
@ -1 +1 @@
|
||||
6CF031C2JWXQB98SNHARWSPJMYR8JM26BVDV08CPH63T2M9JXV30
|
||||
MREDG0XYVSX4RPYSA6JNQZ93P2DDBG45F3M6RBZXRS49M0JTVN40
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -220,8 +220,14 @@ run (void *cls)
|
||||
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
|
||||
"Test: insert_reserve_info\n");
|
||||
|
||||
struct TALER_Amount reserve_balance, withdraw_fee_balance;
|
||||
struct TALER_Amount reserve_balance2 = {}, withdraw_fee_balance2 = {};
|
||||
struct TALER_Amount reserve_balance;
|
||||
struct TALER_Amount withdraw_fee_balance;
|
||||
struct TALER_Amount purse_fee_balance;
|
||||
struct TALER_Amount history_fee_balance;
|
||||
struct TALER_Amount reserve_balance2 = {};
|
||||
struct TALER_Amount withdraw_fee_balance2 = {};
|
||||
struct TALER_Amount purse_fee_balance2 = {};
|
||||
struct TALER_Amount history_fee_balance2 = {};
|
||||
|
||||
GNUNET_assert (GNUNET_OK ==
|
||||
TALER_string_to_amount (CURRENCY ":12.345678",
|
||||
@ -229,6 +235,12 @@ run (void *cls)
|
||||
GNUNET_assert (GNUNET_OK ==
|
||||
TALER_string_to_amount (CURRENCY ":23.456789",
|
||||
&withdraw_fee_balance));
|
||||
GNUNET_assert (GNUNET_OK ==
|
||||
TALER_string_to_amount (CURRENCY ":23.456789",
|
||||
&purse_fee_balance));
|
||||
GNUNET_assert (GNUNET_OK ==
|
||||
TALER_string_to_amount (CURRENCY ":23.456789",
|
||||
&history_fee_balance));
|
||||
|
||||
|
||||
FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
|
||||
@ -268,10 +280,12 @@ run (void *cls)
|
||||
FAILIF (0 != strcmp (payto,
|
||||
"payto://bla/blub"));
|
||||
GNUNET_free (payto);
|
||||
FAILIF (0 != GNUNET_memcmp (&date, &future)
|
||||
|| 0 != GNUNET_memcmp (&reserve_balance2, &reserve_balance)
|
||||
|| 0 != GNUNET_memcmp (&withdraw_fee_balance2,
|
||||
&withdraw_fee_balance));
|
||||
FAILIF (0 != GNUNET_memcmp (&date,
|
||||
&future)
|
||||
|| 0 != TALER_amount_cmp (&reserve_balance2,
|
||||
&reserve_balance)
|
||||
|| 0 != TALER_amount_cmp (&withdraw_fee_balance2,
|
||||
&withdraw_fee_balance));
|
||||
|
||||
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
|
||||
"Test: insert_reserve_summary\n");
|
||||
@ -279,8 +293,10 @@ run (void *cls)
|
||||
FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
|
||||
plugin->insert_reserve_summary (plugin->cls,
|
||||
&master_pub,
|
||||
&reserve_balance,
|
||||
&withdraw_fee_balance,
|
||||
&reserve_balance));
|
||||
&purse_fee_balance,
|
||||
&history_fee_balance));
|
||||
|
||||
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
|
||||
"Test: update_reserve_summary\n");
|
||||
@ -289,25 +305,34 @@ run (void *cls)
|
||||
plugin->update_reserve_summary (plugin->cls,
|
||||
&master_pub,
|
||||
&reserve_balance,
|
||||
&withdraw_fee_balance));
|
||||
&withdraw_fee_balance,
|
||||
&purse_fee_balance,
|
||||
&history_fee_balance));
|
||||
|
||||
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
|
||||
"Test: get_reserve_summary\n");
|
||||
|
||||
ZR_BLK (&reserve_balance2);
|
||||
ZR_BLK (&withdraw_fee_balance2);
|
||||
ZR_BLK (&purse_fee_balance2);
|
||||
ZR_BLK (&history_fee_balance2);
|
||||
|
||||
FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
|
||||
plugin->get_reserve_summary (plugin->cls,
|
||||
&master_pub,
|
||||
&reserve_balance2,
|
||||
&withdraw_fee_balance2));
|
||||
|
||||
FAILIF ( (0 != GNUNET_memcmp (&reserve_balance2,
|
||||
&reserve_balance) ||
|
||||
(0 != GNUNET_memcmp (&withdraw_fee_balance2,
|
||||
&withdraw_fee_balance)) ) );
|
||||
&withdraw_fee_balance2,
|
||||
&purse_fee_balance2,
|
||||
&history_fee_balance2));
|
||||
|
||||
FAILIF ( (0 != TALER_amount_cmp (&reserve_balance2,
|
||||
&reserve_balance) ||
|
||||
(0 != TALER_amount_cmp (&withdraw_fee_balance2,
|
||||
&withdraw_fee_balance)) ||
|
||||
(0 != TALER_amount_cmp (&purse_fee_balance2,
|
||||
&purse_fee_balance)) ||
|
||||
(0 != TALER_amount_cmp (&history_fee_balance2,
|
||||
&history_fee_balance))));
|
||||
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
|
||||
"Test: insert_denomination_balance\n");
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user