diff options
Diffstat (limited to 'src/auditordb')
20 files changed, 135 insertions, 135 deletions
diff --git a/src/auditordb/pg_helper.h b/src/auditordb/pg_helper.h index 3672a2a55..54ccd5978 100644 --- a/src/auditordb/pg_helper.h +++ b/src/auditordb/pg_helper.h @@ -112,7 +112,7 @@ struct PostgresClosure * @param[out] amountp pointer to amount to set */ #define TALER_PQ_RESULT_SPEC_AMOUNT(field, \ - amountp) TALER_PQ_result_spec_amount_tuple ( \ + amountp) TALER_PQ_result_spec_amount ( \ field,pg->currency,amountp) diff --git a/src/auditordb/pg_insert_balance_summary.c b/src/auditordb/pg_insert_balance_summary.c index 048449da1..7634ab80b 100644 --- a/src/auditordb/pg_insert_balance_summary.c +++ b/src/auditordb/pg_insert_balance_summary.c @@ -35,24 +35,24 @@ TAH_PG_insert_balance_summary ( struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (master_pub), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->total_escrowed), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->deposit_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->melt_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->refund_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->purse_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->open_deposit_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->risk), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->loss), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->irregular_loss), + TALER_PQ_query_param_amount (pg->conn, + &dfb->total_escrowed), + TALER_PQ_query_param_amount (pg->conn, + &dfb->deposit_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &dfb->melt_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &dfb->refund_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &dfb->purse_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &dfb->open_deposit_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &dfb->risk), + TALER_PQ_query_param_amount (pg->conn, + &dfb->loss), + TALER_PQ_query_param_amount (pg->conn, + &dfb->irregular_loss), GNUNET_PQ_query_param_end }; diff --git a/src/auditordb/pg_insert_denomination_balance.c b/src/auditordb/pg_insert_denomination_balance.c index e860ff578..bbf4127f4 100644 --- a/src/auditordb/pg_insert_denomination_balance.c +++ b/src/auditordb/pg_insert_denomination_balance.c @@ -35,15 +35,15 @@ TAH_PG_insert_denomination_balance ( struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (denom_pub_hash), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dcd->denom_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dcd->denom_loss), + TALER_PQ_query_param_amount (pg->conn, + &dcd->denom_balance), + TALER_PQ_query_param_amount (pg->conn, + &dcd->denom_loss), GNUNET_PQ_query_param_uint64 (&dcd->num_issued), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dcd->denom_risk), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dcd->recoup_loss), + TALER_PQ_query_param_amount (pg->conn, + &dcd->denom_risk), + TALER_PQ_query_param_amount (pg->conn, + &dcd->recoup_loss), GNUNET_PQ_query_param_end }; diff --git a/src/auditordb/pg_insert_deposit_confirmation.c b/src/auditordb/pg_insert_deposit_confirmation.c index 31d4ea982..7c54494d6 100644 --- a/src/auditordb/pg_insert_deposit_confirmation.c +++ b/src/auditordb/pg_insert_deposit_confirmation.c @@ -40,8 +40,8 @@ TAH_PG_insert_deposit_confirmation ( GNUNET_PQ_query_param_timestamp (&dc->exchange_timestamp), GNUNET_PQ_query_param_timestamp (&dc->wire_deadline), GNUNET_PQ_query_param_timestamp (&dc->refund_deadline), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dc->amount_without_fee), + TALER_PQ_query_param_amount (pg->conn, + &dc->amount_without_fee), GNUNET_PQ_query_param_auto_from_type (&dc->coin_pub), GNUNET_PQ_query_param_auto_from_type (&dc->merchant), GNUNET_PQ_query_param_auto_from_type (&dc->exchange_sig), diff --git a/src/auditordb/pg_insert_historic_denom_revenue.c b/src/auditordb/pg_insert_historic_denom_revenue.c index 730904419..bcafe068a 100644 --- a/src/auditordb/pg_insert_historic_denom_revenue.c +++ b/src/auditordb/pg_insert_historic_denom_revenue.c @@ -40,10 +40,10 @@ TAH_PG_insert_historic_denom_revenue ( GNUNET_PQ_query_param_auto_from_type (master_pub), GNUNET_PQ_query_param_auto_from_type (denom_pub_hash), GNUNET_PQ_query_param_timestamp (&revenue_timestamp), - TALER_PQ_query_param_amount_tuple (pg->conn, - revenue_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - loss_balance), + TALER_PQ_query_param_amount (pg->conn, + revenue_balance), + TALER_PQ_query_param_amount (pg->conn, + loss_balance), GNUNET_PQ_query_param_end }; diff --git a/src/auditordb/pg_insert_historic_reserve_revenue.c b/src/auditordb/pg_insert_historic_reserve_revenue.c index 43fc7e343..d5ce9ed47 100644 --- a/src/auditordb/pg_insert_historic_reserve_revenue.c +++ b/src/auditordb/pg_insert_historic_reserve_revenue.c @@ -38,8 +38,8 @@ TAH_PG_insert_historic_reserve_revenue ( GNUNET_PQ_query_param_auto_from_type (master_pub), GNUNET_PQ_query_param_timestamp (&start_time), GNUNET_PQ_query_param_timestamp (&end_time), - TALER_PQ_query_param_amount_tuple (pg->conn, - reserve_profits), + TALER_PQ_query_param_amount (pg->conn, + reserve_profits), GNUNET_PQ_query_param_end }; diff --git a/src/auditordb/pg_insert_predicted_result.c b/src/auditordb/pg_insert_predicted_result.c index 070c7b76e..6f5250f01 100644 --- a/src/auditordb/pg_insert_predicted_result.c +++ b/src/auditordb/pg_insert_predicted_result.c @@ -36,10 +36,10 @@ TAH_PG_insert_predicted_result ( struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (master_pub), - TALER_PQ_query_param_amount_tuple (pg->conn, - balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - drained), + TALER_PQ_query_param_amount (pg->conn, + balance), + TALER_PQ_query_param_amount (pg->conn, + drained), GNUNET_PQ_query_param_end }; diff --git a/src/auditordb/pg_insert_purse_info.c b/src/auditordb/pg_insert_purse_info.c index 4c3a6f066..cd97defc0 100644 --- a/src/auditordb/pg_insert_purse_info.c +++ b/src/auditordb/pg_insert_purse_info.c @@ -38,8 +38,8 @@ TAH_PG_insert_purse_info ( struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (purse_pub), GNUNET_PQ_query_param_auto_from_type (master_pub), - TALER_PQ_query_param_amount_tuple (pg->conn, - balance), + TALER_PQ_query_param_amount (pg->conn, + balance), GNUNET_PQ_query_param_timestamp (&expiration_date), GNUNET_PQ_query_param_end }; diff --git a/src/auditordb/pg_insert_purse_summary.c b/src/auditordb/pg_insert_purse_summary.c index 4c848c2dc..addb4adc7 100644 --- a/src/auditordb/pg_insert_purse_summary.c +++ b/src/auditordb/pg_insert_purse_summary.c @@ -35,8 +35,8 @@ TAH_PG_insert_purse_summary ( struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (master_pub), - TALER_PQ_query_param_amount_tuple (pg->conn, - &sum->balance), + TALER_PQ_query_param_amount (pg->conn, + &sum->balance), GNUNET_PQ_query_param_uint64 (&sum->open_purses), GNUNET_PQ_query_param_end }; diff --git a/src/auditordb/pg_insert_reserve_info.c b/src/auditordb/pg_insert_reserve_info.c index 782f6534b..a7e3fd922 100644 --- a/src/auditordb/pg_insert_reserve_info.c +++ b/src/auditordb/pg_insert_reserve_info.c @@ -39,20 +39,20 @@ TAH_PG_insert_reserve_info ( struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (reserve_pub), GNUNET_PQ_query_param_auto_from_type (master_pub), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->reserve_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->reserve_loss), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->withdraw_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->close_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->purse_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->open_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->history_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->reserve_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->reserve_loss), + TALER_PQ_query_param_amount (pg->conn, + &rfb->withdraw_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->close_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->purse_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->open_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->history_fee_balance), GNUNET_PQ_query_param_timestamp (&expiration_date), NULL == origin_account ? GNUNET_PQ_query_param_null () diff --git a/src/auditordb/pg_insert_reserve_summary.c b/src/auditordb/pg_insert_reserve_summary.c index a6c0985f9..e085d23b6 100644 --- a/src/auditordb/pg_insert_reserve_summary.c +++ b/src/auditordb/pg_insert_reserve_summary.c @@ -35,20 +35,20 @@ TAH_PG_insert_reserve_summary ( struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (master_pub), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->reserve_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->reserve_loss), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->withdraw_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->close_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->purse_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->open_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->history_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->reserve_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->reserve_loss), + TALER_PQ_query_param_amount (pg->conn, + &rfb->withdraw_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->close_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->purse_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->open_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->history_fee_balance), GNUNET_PQ_query_param_end }; diff --git a/src/auditordb/pg_insert_wire_fee_summary.c b/src/auditordb/pg_insert_wire_fee_summary.c index 5c01e11b8..26ca1ac98 100644 --- a/src/auditordb/pg_insert_wire_fee_summary.c +++ b/src/auditordb/pg_insert_wire_fee_summary.c @@ -35,8 +35,8 @@ TAH_PG_insert_wire_fee_summary ( struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (master_pub), - TALER_PQ_query_param_amount_tuple (pg->conn, - wire_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + wire_fee_balance), GNUNET_PQ_query_param_end }; diff --git a/src/auditordb/pg_update_balance_summary.c b/src/auditordb/pg_update_balance_summary.c index a2e0c409a..d96980791 100644 --- a/src/auditordb/pg_update_balance_summary.c +++ b/src/auditordb/pg_update_balance_summary.c @@ -34,24 +34,24 @@ TAH_PG_update_balance_summary ( { struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->total_escrowed), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->deposit_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->melt_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->refund_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->purse_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->open_deposit_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->risk), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->loss), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dfb->irregular_loss), + TALER_PQ_query_param_amount (pg->conn, + &dfb->total_escrowed), + TALER_PQ_query_param_amount (pg->conn, + &dfb->deposit_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &dfb->melt_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &dfb->refund_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &dfb->purse_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &dfb->open_deposit_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &dfb->risk), + TALER_PQ_query_param_amount (pg->conn, + &dfb->loss), + TALER_PQ_query_param_amount (pg->conn, + &dfb->irregular_loss), GNUNET_PQ_query_param_auto_from_type (master_pub), GNUNET_PQ_query_param_end }; diff --git a/src/auditordb/pg_update_denomination_balance.c b/src/auditordb/pg_update_denomination_balance.c index c7f8f5d5a..0c738779e 100644 --- a/src/auditordb/pg_update_denomination_balance.c +++ b/src/auditordb/pg_update_denomination_balance.c @@ -34,15 +34,15 @@ TAH_PG_update_denomination_balance ( { struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { - TALER_PQ_query_param_amount_tuple (pg->conn, - &dcd->denom_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dcd->denom_loss), + TALER_PQ_query_param_amount (pg->conn, + &dcd->denom_balance), + TALER_PQ_query_param_amount (pg->conn, + &dcd->denom_loss), GNUNET_PQ_query_param_uint64 (&dcd->num_issued), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dcd->denom_risk), - TALER_PQ_query_param_amount_tuple (pg->conn, - &dcd->recoup_loss), + TALER_PQ_query_param_amount (pg->conn, + &dcd->denom_risk), + TALER_PQ_query_param_amount (pg->conn, + &dcd->recoup_loss), GNUNET_PQ_query_param_auto_from_type (denom_pub_hash), GNUNET_PQ_query_param_end }; diff --git a/src/auditordb/pg_update_predicted_result.c b/src/auditordb/pg_update_predicted_result.c index 207b27930..fd82ecc59 100644 --- a/src/auditordb/pg_update_predicted_result.c +++ b/src/auditordb/pg_update_predicted_result.c @@ -35,10 +35,10 @@ TAH_PG_update_predicted_result ( { struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { - TALER_PQ_query_param_amount_tuple (pg->conn, - balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - drained), + TALER_PQ_query_param_amount (pg->conn, + balance), + TALER_PQ_query_param_amount (pg->conn, + drained), GNUNET_PQ_query_param_auto_from_type (master_pub), GNUNET_PQ_query_param_end }; diff --git a/src/auditordb/pg_update_purse_info.c b/src/auditordb/pg_update_purse_info.c index a9c9e5d3f..5e2d65bca 100644 --- a/src/auditordb/pg_update_purse_info.c +++ b/src/auditordb/pg_update_purse_info.c @@ -38,8 +38,8 @@ TAH_PG_update_purse_info ( struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (purse_pub), GNUNET_PQ_query_param_auto_from_type (master_pub), - TALER_PQ_query_param_amount_tuple (pg->conn, - balance), + TALER_PQ_query_param_amount (pg->conn, + balance), GNUNET_PQ_query_param_end }; diff --git a/src/auditordb/pg_update_purse_summary.c b/src/auditordb/pg_update_purse_summary.c index 3415b9555..626151a26 100644 --- a/src/auditordb/pg_update_purse_summary.c +++ b/src/auditordb/pg_update_purse_summary.c @@ -35,8 +35,8 @@ TAH_PG_update_purse_summary ( struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (master_pub), - TALER_PQ_query_param_amount_tuple (pg->conn, - &sum->balance), + TALER_PQ_query_param_amount (pg->conn, + &sum->balance), GNUNET_PQ_query_param_uint64 (&sum->open_purses), GNUNET_PQ_query_param_end }; diff --git a/src/auditordb/pg_update_reserve_info.c b/src/auditordb/pg_update_reserve_info.c index 2c9632354..b851feda9 100644 --- a/src/auditordb/pg_update_reserve_info.c +++ b/src/auditordb/pg_update_reserve_info.c @@ -36,18 +36,18 @@ TAH_PG_update_reserve_info ( { struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->reserve_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->reserve_loss), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->withdraw_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->purse_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->open_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->history_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->reserve_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->reserve_loss), + TALER_PQ_query_param_amount (pg->conn, + &rfb->withdraw_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->purse_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->open_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->history_fee_balance), GNUNET_PQ_query_param_timestamp (&expiration_date), GNUNET_PQ_query_param_auto_from_type (reserve_pub), GNUNET_PQ_query_param_auto_from_type (master_pub), diff --git a/src/auditordb/pg_update_reserve_summary.c b/src/auditordb/pg_update_reserve_summary.c index 42c3e55fc..58da3048e 100644 --- a/src/auditordb/pg_update_reserve_summary.c +++ b/src/auditordb/pg_update_reserve_summary.c @@ -34,20 +34,20 @@ TAH_PG_update_reserve_summary ( { struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->reserve_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->reserve_loss), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->withdraw_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->close_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->purse_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->open_fee_balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - &rfb->history_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->reserve_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->reserve_loss), + TALER_PQ_query_param_amount (pg->conn, + &rfb->withdraw_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->close_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->purse_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->open_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + &rfb->history_fee_balance), GNUNET_PQ_query_param_auto_from_type (master_pub), GNUNET_PQ_query_param_end }; diff --git a/src/auditordb/pg_update_wire_fee_summary.c b/src/auditordb/pg_update_wire_fee_summary.c index b0a343711..d57467a09 100644 --- a/src/auditordb/pg_update_wire_fee_summary.c +++ b/src/auditordb/pg_update_wire_fee_summary.c @@ -34,8 +34,8 @@ TAH_PG_update_wire_fee_summary ( { struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { - TALER_PQ_query_param_amount_tuple (pg->conn, - wire_fee_balance), + TALER_PQ_query_param_amount (pg->conn, + wire_fee_balance), GNUNET_PQ_query_param_auto_from_type (master_pub), GNUNET_PQ_query_param_end }; |