diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-05-23 14:57:00 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-05-23 14:57:00 +0200 |
| commit | cdd2930a9951a552d221b8a8b8e9c0df35ad8be2 (patch) | |
| tree | 2389f0cad26e47d2315650f2f9e698120c5f2182 /src/exchangedb | |
| parent | 2035294adbcafc93c70d2cb7d27ce1a74d5a61ca (diff) | |
-misc fixes to reserve history
Diffstat (limited to 'src/exchangedb')
| -rw-r--r-- | src/exchangedb/plugin_exchangedb_common.c | 2 | ||||
| -rw-r--r-- | src/exchangedb/plugin_exchangedb_postgres.c | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/exchangedb/plugin_exchangedb_common.c b/src/exchangedb/plugin_exchangedb_common.c index c9ffa5b8..e36074e3 100644 --- a/src/exchangedb/plugin_exchangedb_common.c +++ b/src/exchangedb/plugin_exchangedb_common.c @@ -77,6 +77,7 @@ common_free_reserve_history (void *cls, merge = rh->details.merge; GNUNET_free (merge); + break; } case TALER_EXCHANGEDB_RO_HISTORY_REQUEST: { @@ -84,6 +85,7 @@ common_free_reserve_history (void *cls, history = rh->details.history; GNUNET_free (history); + break; } } { diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c index ddb8069b..0db3d4df 100644 --- a/src/exchangedb/plugin_exchangedb_postgres.c +++ b/src/exchangedb/plugin_exchangedb_postgres.c @@ -4909,7 +4909,7 @@ postgres_inselect_wallet_kyc_status ( payto_uri, &h_payto, kyc); - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Wire account for `%s' is %llu\n", payto_uri, (unsigned long long) kyc->payment_target_uuid); @@ -6230,8 +6230,8 @@ add_p2p_merge (void *cls, merge->flags = (enum TALER_WalletAccountMergeFlags) flags32; } GNUNET_assert (0 <= - TALER_amount_add (&rhc->balance_out, - &rhc->balance_out, + TALER_amount_add (&rhc->balance_in, + &rhc->balance_in, &merge->amount_with_fee)); GNUNET_assert (0 <= TALER_amount_subtract (&rhc->balance_out, @@ -6443,6 +6443,12 @@ postgres_get_reserve_status (void *cls, /** #TALER_EXCHANGEDB_RO_EXCHANGE_TO_BANK */ { "close_by_reserve", &add_exchange_to_bank }, + /** #TALER_EXCHANGEDB_RO_PURSE_MERGE */ + { "merge_by_reserve", + &add_p2p_merge }, + /** #TALER_EXCHANGEDB_RO_HISTORY_REQUEST */ + { "history_by_reserve", + &add_history_requests }, /* List terminator */ { NULL, NULL } |