diff options
Diffstat (limited to 'src/mintdb')
| -rw-r--r-- | src/mintdb/plugin_mintdb_postgres.c | 9 | ||||
| -rw-r--r-- | src/mintdb/test_mintdb.c | 15 |
2 files changed, 6 insertions, 18 deletions
diff --git a/src/mintdb/plugin_mintdb_postgres.c b/src/mintdb/plugin_mintdb_postgres.c index 5015f477..772b86e8 100644 --- a/src/mintdb/plugin_mintdb_postgres.c +++ b/src/mintdb/plugin_mintdb_postgres.c @@ -3739,7 +3739,7 @@ postgres_get_coin_transactions (void *cls, /** - * Lookup the list of Taler transactions that was aggregated + * Lookup the list of Taler transactions that were aggregated * into a wire transfer by the respective @a wtid. * * @param cls closure @@ -3793,7 +3793,6 @@ postgres_lookup_wire_transfer (void *cls, struct GNUNET_TIME_Absolute exec_time; struct TALER_Amount coin_amount; struct TALER_Amount coin_fee; - struct TALER_Amount transfer_amount; struct GNUNET_PQ_ResultSpec rs[] = { GNUNET_PQ_result_spec_auto_from_type ("h_contract", &h_contract), GNUNET_PQ_result_spec_auto_from_type ("h_wire", &h_wire), @@ -3803,8 +3802,7 @@ postgres_lookup_wire_transfer (void *cls, GNUNET_PQ_result_spec_absolute_time ("execution_time", &exec_time), TALER_PQ_result_spec_amount ("coin_amount", &coin_amount), TALER_PQ_result_spec_amount ("coin_fee", &coin_fee), - TALER_PQ_result_spec_amount ("transfer_total", &transfer_amount), - GNUNET_PQ_result_spec_end + GNUNET_PQ_result_spec_end }; if (GNUNET_OK != GNUNET_PQ_extract_result (result, rs, i)) { @@ -3819,8 +3817,7 @@ postgres_lookup_wire_transfer (void *cls, transaction_id, &coin_pub, &coin_amount, - &coin_fee, - &transfer_amount); + &coin_fee); } PQclear (result); return GNUNET_OK; diff --git a/src/mintdb/test_mintdb.c b/src/mintdb/test_mintdb.c index 07f5d078..0938f8fa 100644 --- a/src/mintdb/test_mintdb.c +++ b/src/mintdb/test_mintdb.c @@ -453,8 +453,7 @@ cb_wt_never (void *cls, uint64_t transaction_id, const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_Amount *coin_value, - const struct TALER_Amount *coin_fee, - const struct TALER_Amount *transfer_value) + const struct TALER_Amount *coin_fee) { GNUNET_assert (0); /* this statement should be unreachable */ } @@ -468,7 +467,6 @@ cb_wtid_never (void *cls, const struct TALER_WireTransferIdentifierRawP *wtid, const struct TALER_Amount *coin_contribution, const struct TALER_Amount *coin_fee, - const struct TALER_Amount *total_amount, struct GNUNET_TIME_Absolute execution_time) { GNUNET_assert (0); @@ -498,8 +496,7 @@ cb_wt_check (void *cls, uint64_t transaction_id, const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_Amount *coin_value, - const struct TALER_Amount *coin_fee, - const struct TALER_Amount *transfer_value) + const struct TALER_Amount *coin_fee) { GNUNET_assert (cls == &cb_wt_never); GNUNET_assert (0 == memcmp (merchant_pub, @@ -519,8 +516,6 @@ cb_wt_check (void *cls, &coin_value_wt)); GNUNET_assert (0 == TALER_amount_cmp (coin_fee, &coin_fee_wt)); - GNUNET_assert (0 == TALER_amount_cmp (transfer_value, - &transfer_value_wt)); } @@ -532,7 +527,6 @@ cb_wtid_check (void *cls, const struct TALER_WireTransferIdentifierRawP *wtid, const struct TALER_Amount *coin_contribution, const struct TALER_Amount *coin_fee, - const struct TALER_Amount *total_amount, struct GNUNET_TIME_Absolute execution_time) { GNUNET_assert (cls == &cb_wtid_never); @@ -545,8 +539,6 @@ cb_wtid_check (void *cls, &coin_value_wt)); GNUNET_assert (0 == TALER_amount_cmp (coin_fee, &coin_fee_wt)); - GNUNET_assert (0 == TALER_amount_cmp (total_amount, - &transfer_value_wt)); } @@ -826,8 +818,7 @@ run (void *cls, execution_time_wt, &coin_pub_wt, &coin_value_wt, - &coin_fee_wt, - &transfer_value_wt)); + &coin_fee_wt)); FAILIF (GNUNET_OK != plugin->lookup_wire_transfer (plugin->cls, session, |