diff options
Diffstat (limited to 'src/exchangedb')
43 files changed, 180 insertions, 183 deletions
diff --git a/src/exchangedb/pg_add_denomination_key.c b/src/exchangedb/pg_add_denomination_key.c index 48d882c9a..eb50304d3 100644 --- a/src/exchangedb/pg_add_denomination_key.c +++ b/src/exchangedb/pg_add_denomination_key.c @@ -43,16 +43,16 @@ TEH_PG_add_denomination_key ( GNUNET_PQ_query_param_timestamp (&meta->expire_withdraw), GNUNET_PQ_query_param_timestamp (&meta->expire_deposit), GNUNET_PQ_query_param_timestamp (&meta->expire_legal), - TALER_PQ_query_param_amount_tuple (pg->conn, - &meta->value), - TALER_PQ_query_param_amount_tuple (pg->conn, - &meta->fees.withdraw), - TALER_PQ_query_param_amount_tuple (pg->conn, - &meta->fees.deposit), - TALER_PQ_query_param_amount_tuple (pg->conn, - &meta->fees.refresh), - TALER_PQ_query_param_amount_tuple (pg->conn, - &meta->fees.refund), + TALER_PQ_query_param_amount (pg->conn, + &meta->value), + TALER_PQ_query_param_amount (pg->conn, + &meta->fees.withdraw), + TALER_PQ_query_param_amount (pg->conn, + &meta->fees.deposit), + TALER_PQ_query_param_amount (pg->conn, + &meta->fees.refresh), + TALER_PQ_query_param_amount (pg->conn, + &meta->fees.refund), GNUNET_PQ_query_param_uint32 (&meta->age_mask.bits), GNUNET_PQ_query_param_end }; diff --git a/src/exchangedb/pg_add_policy_fulfillment_proof.c b/src/exchangedb/pg_add_policy_fulfillment_proof.c index 5ba18f47a..2e83b5742 100644 --- a/src/exchangedb/pg_add_policy_fulfillment_proof.c +++ b/src/exchangedb/pg_add_policy_fulfillment_proof.c @@ -112,14 +112,14 @@ TEH_PG_add_policy_fulfillment_proof ( struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (&pos->hash_code), GNUNET_PQ_query_param_timestamp (&pos->deadline), - TALER_PQ_query_param_amount_tuple (pg->conn, - &pos->commitment), - TALER_PQ_query_param_amount_tuple (pg->conn, - &pos->accumulated_total), - TALER_PQ_query_param_amount_tuple (pg->conn, - &pos->policy_fee), - TALER_PQ_query_param_amount_tuple (pg->conn, - &pos->transferable_amount), + TALER_PQ_query_param_amount (pg->conn, + &pos->commitment), + TALER_PQ_query_param_amount (pg->conn, + &pos->accumulated_total), + TALER_PQ_query_param_amount (pg->conn, + &pos->policy_fee), + TALER_PQ_query_param_amount (pg->conn, + &pos->transferable_amount), GNUNET_PQ_query_param_auto_from_type (&pos->fulfillment_state), GNUNET_PQ_query_param_end }; diff --git a/src/exchangedb/pg_create_aggregation_transient.c b/src/exchangedb/pg_create_aggregation_transient.c index 5c58c696e..4ab537d3a 100644 --- a/src/exchangedb/pg_create_aggregation_transient.c +++ b/src/exchangedb/pg_create_aggregation_transient.c @@ -38,8 +38,8 @@ TEH_PG_create_aggregation_transient ( { struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { - TALER_PQ_query_param_amount_tuple (pg->conn, - total), + TALER_PQ_query_param_amount (pg->conn, + total), GNUNET_PQ_query_param_auto_from_type (merchant_pub), GNUNET_PQ_query_param_auto_from_type (h_payto), GNUNET_PQ_query_param_uint64 (&kyc_requirement_row), diff --git a/src/exchangedb/pg_do_age_withdraw.c b/src/exchangedb/pg_do_age_withdraw.c index 0c79f58c9..93e15716b 100644 --- a/src/exchangedb/pg_do_age_withdraw.c +++ b/src/exchangedb/pg_do_age_withdraw.c @@ -44,8 +44,8 @@ TEH_PG_do_age_withdraw ( struct PostgresClosure *pg = cls; struct GNUNET_TIME_Timestamp gc; struct GNUNET_PQ_QueryParam params[] = { - TALER_PQ_query_param_amount_tuple (pg->conn, - &commitment->amount_with_fee), + TALER_PQ_query_param_amount (pg->conn, + &commitment->amount_with_fee), GNUNET_PQ_query_param_auto_from_type (&commitment->reserve_pub), GNUNET_PQ_query_param_auto_from_type (&commitment->reserve_sig), GNUNET_PQ_query_param_timestamp (&now), diff --git a/src/exchangedb/pg_do_batch_withdraw.c b/src/exchangedb/pg_do_batch_withdraw.c index 8e118a99b..394dc92a6 100644 --- a/src/exchangedb/pg_do_batch_withdraw.c +++ b/src/exchangedb/pg_do_batch_withdraw.c @@ -43,8 +43,8 @@ TEH_PG_do_batch_withdraw ( struct PostgresClosure *pg = cls; struct GNUNET_TIME_Timestamp gc; struct GNUNET_PQ_QueryParam params[] = { - TALER_PQ_query_param_amount_tuple (pg->conn, - amount), + TALER_PQ_query_param_amount (pg->conn, + amount), GNUNET_PQ_query_param_auto_from_type (reserve_pub), GNUNET_PQ_query_param_timestamp (&now), GNUNET_PQ_query_param_timestamp (&gc), diff --git a/src/exchangedb/pg_do_batch_withdraw_insert.c b/src/exchangedb/pg_do_batch_withdraw_insert.c index 2952483cb..58dd73586 100644 --- a/src/exchangedb/pg_do_batch_withdraw_insert.c +++ b/src/exchangedb/pg_do_batch_withdraw_insert.c @@ -41,8 +41,8 @@ TEH_PG_do_batch_withdraw_insert ( NULL == nonce ? GNUNET_PQ_query_param_null () : GNUNET_PQ_query_param_auto_from_type (nonce), - TALER_PQ_query_param_amount_tuple (pg->conn, - &collectable->amount_with_fee), + TALER_PQ_query_param_amount (pg->conn, + &collectable->amount_with_fee), GNUNET_PQ_query_param_auto_from_type (&collectable->denom_pub_hash), GNUNET_PQ_query_param_uint64 (&ruuid), GNUNET_PQ_query_param_auto_from_type (&collectable->reserve_sig), diff --git a/src/exchangedb/pg_do_deposit.c b/src/exchangedb/pg_do_deposit.c index 3120232ba..ce09fb72c 100644 --- a/src/exchangedb/pg_do_deposit.c +++ b/src/exchangedb/pg_do_deposit.c @@ -41,8 +41,8 @@ TEH_PG_do_deposit ( struct PostgresClosure *pg = cls; uint64_t deposit_shard = TEH_PG_compute_shard (&deposit->merchant_pub); struct GNUNET_PQ_QueryParam params[] = { - TALER_PQ_query_param_amount_tuple (pg->conn, - &deposit->amount_with_fee), + TALER_PQ_query_param_amount (pg->conn, + &deposit->amount_with_fee), GNUNET_PQ_query_param_auto_from_type (&deposit->h_contract_terms), GNUNET_PQ_query_param_auto_from_type (&deposit->wire_salt), GNUNET_PQ_query_param_timestamp (&deposit->timestamp), diff --git a/src/exchangedb/pg_do_melt.c b/src/exchangedb/pg_do_melt.c index 0a827acce..0b26386d8 100644 --- a/src/exchangedb/pg_do_melt.c +++ b/src/exchangedb/pg_do_melt.c @@ -40,8 +40,8 @@ TEH_PG_do_melt ( NULL == rms ? GNUNET_PQ_query_param_null () : GNUNET_PQ_query_param_auto_from_type (rms), - TALER_PQ_query_param_amount_tuple (pg->conn, - &refresh->amount_with_fee), + TALER_PQ_query_param_amount (pg->conn, + &refresh->amount_with_fee), GNUNET_PQ_query_param_auto_from_type (&refresh->rc), GNUNET_PQ_query_param_auto_from_type (&refresh->coin.coin_pub), GNUNET_PQ_query_param_auto_from_type (&refresh->coin_sig), diff --git a/src/exchangedb/pg_do_purse_deposit.c b/src/exchangedb/pg_do_purse_deposit.c index 3ac3cfbfc..bdb1f4749 100644 --- a/src/exchangedb/pg_do_purse_deposit.c +++ b/src/exchangedb/pg_do_purse_deposit.c @@ -47,12 +47,12 @@ TEH_PG_do_purse_deposit ( ? GNUNET_PQ_query_param_null () : GNUNET_PQ_query_param_uint64 (&partner_id), GNUNET_PQ_query_param_auto_from_type (purse_pub), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, amount), GNUNET_PQ_query_param_auto_from_type (coin_pub), GNUNET_PQ_query_param_auto_from_type (coin_sig), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, amount_minus_fee), GNUNET_PQ_query_param_timestamp (&reserve_expiration), diff --git a/src/exchangedb/pg_do_refund.c b/src/exchangedb/pg_do_refund.c index 887b610bd..194dab18d 100644 --- a/src/exchangedb/pg_do_refund.c +++ b/src/exchangedb/pg_do_refund.c @@ -42,12 +42,12 @@ TEH_PG_do_refund ( uint64_t deposit_shard = TEH_PG_compute_shard (&refund->details.merchant_pub); struct TALER_Amount amount_without_fee; struct GNUNET_PQ_QueryParam params[] = { - TALER_PQ_query_param_amount_tuple (pg->conn, - &refund->details.refund_amount), - TALER_PQ_query_param_amount_tuple (pg->conn, - &amount_without_fee), - TALER_PQ_query_param_amount_tuple (pg->conn, - deposit_fee), + TALER_PQ_query_param_amount (pg->conn, + &refund->details.refund_amount), + TALER_PQ_query_param_amount (pg->conn, + &amount_without_fee), + TALER_PQ_query_param_amount (pg->conn, + deposit_fee), GNUNET_PQ_query_param_auto_from_type (&refund->details.h_contract_terms), GNUNET_PQ_query_param_uint64 (&refund->details.rtransaction_id), GNUNET_PQ_query_param_uint64 (&deposit_shard), diff --git a/src/exchangedb/pg_do_reserve_open.c b/src/exchangedb/pg_do_reserve_open.c index cdc42964c..e82a3e9cf 100644 --- a/src/exchangedb/pg_do_reserve_open.c +++ b/src/exchangedb/pg_do_reserve_open.c @@ -44,10 +44,10 @@ TEH_PG_do_reserve_open ( struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (reserve_pub), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, total_paid), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, reserve_payment), GNUNET_PQ_query_param_uint32 (&min_purse_limit), @@ -56,14 +56,14 @@ TEH_PG_do_reserve_open ( GNUNET_PQ_query_param_timestamp (&desired_expiration), GNUNET_PQ_query_param_relative_time (&pg->legal_reserve_expiration_time), GNUNET_PQ_query_param_timestamp (&now), - TALER_PQ_query_param_amount_tuple (pg->conn, - open_fee), + TALER_PQ_query_param_amount (pg->conn, + open_fee), GNUNET_PQ_query_param_end }; struct GNUNET_PQ_ResultSpec rs[] = { - TALER_PQ_result_spec_amount_tuple ("out_open_cost", - pg->currency, - open_cost), + TALER_PQ_result_spec_amount ("out_open_cost", + pg->currency, + open_cost), GNUNET_PQ_result_spec_timestamp ("out_final_expiration", final_expiration), GNUNET_PQ_result_spec_bool ("out_no_funds", diff --git a/src/exchangedb/pg_do_reserve_purse.c b/src/exchangedb/pg_do_reserve_purse.c index 6e05a5ab0..e03e23fec 100644 --- a/src/exchangedb/pg_do_reserve_purse.c +++ b/src/exchangedb/pg_do_reserve_purse.c @@ -74,8 +74,8 @@ TEH_PG_do_reserve_purse ( GNUNET_PQ_query_param_timestamp (&reserve_gc), GNUNET_PQ_query_param_auto_from_type (reserve_sig), GNUNET_PQ_query_param_bool (NULL == purse_fee), - TALER_PQ_query_param_amount_tuple (pg->conn, - NULL == purse_fee + TALER_PQ_query_param_amount (pg->conn, + NULL == purse_fee ? &zero_fee : purse_fee), GNUNET_PQ_query_param_auto_from_type (reserve_pub), diff --git a/src/exchangedb/pg_do_withdraw.c b/src/exchangedb/pg_do_withdraw.c index 037941792..e32afcda1 100644 --- a/src/exchangedb/pg_do_withdraw.c +++ b/src/exchangedb/pg_do_withdraw.c @@ -46,8 +46,8 @@ TEH_PG_do_withdraw ( NULL == nonce ? GNUNET_PQ_query_param_null () : GNUNET_PQ_query_param_auto_from_type (nonce), - TALER_PQ_query_param_amount_tuple (pg->conn, - &collectable->amount_with_fee), + TALER_PQ_query_param_amount (pg->conn, + &collectable->amount_with_fee), GNUNET_PQ_query_param_auto_from_type (&collectable->denom_pub_hash), GNUNET_PQ_query_param_auto_from_type (&collectable->reserve_pub), GNUNET_PQ_query_param_auto_from_type (&collectable->reserve_sig), diff --git a/src/exchangedb/pg_get_age_withdraw.c b/src/exchangedb/pg_get_age_withdraw.c index 62ccaa834..6247fd14f 100644 --- a/src/exchangedb/pg_get_age_withdraw.c +++ b/src/exchangedb/pg_get_age_withdraw.c @@ -48,9 +48,9 @@ TEH_PG_get_age_withdraw ( &aw->reserve_pub), GNUNET_PQ_result_spec_uint16 ("max_age", &aw->max_age), - TALER_PQ_result_spec_amount_tuple ("amount_with_fee", - pg->currency, - &aw->amount_with_fee), + TALER_PQ_result_spec_amount ("amount_with_fee", + pg->currency, + &aw->amount_with_fee), GNUNET_PQ_result_spec_uint16 ("noreveal_index", &aw->noreveal_index), TALER_PQ_result_spec_array_blinded_coin_hash ( diff --git a/src/exchangedb/pg_get_expired_reserves.c b/src/exchangedb/pg_get_expired_reserves.c index 852d1780a..be9ece98a 100644 --- a/src/exchangedb/pg_get_expired_reserves.c +++ b/src/exchangedb/pg_get_expired_reserves.c @@ -84,9 +84,9 @@ reserve_expired_cb (void *cls, &account_details), GNUNET_PQ_result_spec_auto_from_type ("reserve_pub", &reserve_pub), - TALER_PQ_result_spec_amount_tuple ("current_balance", - pg->currency, - &remaining_balance), + TALER_PQ_result_spec_amount ("current_balance", + pg->currency, + &remaining_balance), GNUNET_PQ_result_spec_end }; diff --git a/src/exchangedb/pg_get_reserve_balance.c b/src/exchangedb/pg_get_reserve_balance.c index 8886d2b1c..140bf3b70 100644 --- a/src/exchangedb/pg_get_reserve_balance.c +++ b/src/exchangedb/pg_get_reserve_balance.c @@ -36,9 +36,9 @@ TEH_PG_get_reserve_balance (void *cls, GNUNET_PQ_query_param_end }; struct GNUNET_PQ_ResultSpec rs[] = { - TALER_PQ_result_spec_amount_tuple ("current_balance", - pg->currency, - balance), + TALER_PQ_result_spec_amount ("current_balance", + pg->currency, + balance), GNUNET_PQ_result_spec_end }; diff --git a/src/exchangedb/pg_helper.h b/src/exchangedb/pg_helper.h index 56f4afc31..c63c9111d 100644 --- a/src/exchangedb/pg_helper.h +++ b/src/exchangedb/pg_helper.h @@ -142,7 +142,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/exchangedb/pg_insert_aml_decision.c b/src/exchangedb/pg_insert_aml_decision.c index 80eb7f2b8..a3653824c 100644 --- a/src/exchangedb/pg_insert_aml_decision.c +++ b/src/exchangedb/pg_insert_aml_decision.c @@ -55,8 +55,8 @@ TEH_PG_insert_aml_decision ( : NULL; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (h_payto), - TALER_PQ_query_param_amount_tuple (pg->conn, - new_threshold), + TALER_PQ_query_param_amount (pg->conn, + new_threshold), GNUNET_PQ_query_param_uint32 (&ns), GNUNET_PQ_query_param_timestamp (&decision_time), GNUNET_PQ_query_param_string (justification), diff --git a/src/exchangedb/pg_insert_close_request.c b/src/exchangedb/pg_insert_close_request.c index 01160b745..b4bc5f4a7 100644 --- a/src/exchangedb/pg_insert_close_request.c +++ b/src/exchangedb/pg_insert_close_request.c @@ -41,10 +41,10 @@ TEH_PG_insert_close_request ( GNUNET_PQ_query_param_auto_from_type (reserve_pub), GNUNET_PQ_query_param_timestamp (&request_timestamp), GNUNET_PQ_query_param_auto_from_type (reserve_sig), - TALER_PQ_query_param_amount_tuple (pg->conn, - balance), - TALER_PQ_query_param_amount_tuple (pg->conn, - closing_fee), + TALER_PQ_query_param_amount (pg->conn, + balance), + TALER_PQ_query_param_amount (pg->conn, + closing_fee), GNUNET_PQ_query_param_string (payto_uri), GNUNET_PQ_query_param_end }; diff --git a/src/exchangedb/pg_insert_denomination_info.c b/src/exchangedb/pg_insert_denomination_info.c index 620d6dd78..878bc5d81 100644 --- a/src/exchangedb/pg_insert_denomination_info.c +++ b/src/exchangedb/pg_insert_denomination_info.c @@ -42,16 +42,16 @@ TEH_PG_insert_denomination_info ( GNUNET_PQ_query_param_timestamp (&issue->expire_withdraw), GNUNET_PQ_query_param_timestamp (&issue->expire_deposit), GNUNET_PQ_query_param_timestamp (&issue->expire_legal), - TALER_PQ_query_param_amount_tuple (pg->conn, - &issue->value), - TALER_PQ_query_param_amount_tuple (pg->conn, - &issue->fees.withdraw), - TALER_PQ_query_param_amount_tuple (pg->conn, - &issue->fees.deposit), - TALER_PQ_query_param_amount_tuple (pg->conn, - &issue->fees.refresh), - TALER_PQ_query_param_amount_tuple (pg->conn, - &issue->fees.refund), + TALER_PQ_query_param_amount (pg->conn, + &issue->value), + TALER_PQ_query_param_amount (pg->conn, + &issue->fees.withdraw), + TALER_PQ_query_param_amount (pg->conn, + &issue->fees.deposit), + TALER_PQ_query_param_amount (pg->conn, + &issue->fees.refresh), + TALER_PQ_query_param_amount (pg->conn, + &issue->fees.refund), GNUNET_PQ_query_param_uint32 (&denom_pub->age_mask.bits), GNUNET_PQ_query_param_end }; diff --git a/src/exchangedb/pg_insert_deposit.c b/src/exchangedb/pg_insert_deposit.c index d674983e7..a55355259 100644 --- a/src/exchangedb/pg_insert_deposit.c +++ b/src/exchangedb/pg_insert_deposit.c @@ -52,8 +52,8 @@ TEH_PG_insert_deposit (void *cls, uint64_t shard = TEH_PG_compute_shard (&deposit->merchant_pub); struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (&deposit->coin.coin_pub), - TALER_PQ_query_param_amount_tuple (pg->conn, - &deposit->amount_with_fee), + TALER_PQ_query_param_amount (pg->conn, + &deposit->amount_with_fee), GNUNET_PQ_query_param_timestamp (&deposit->timestamp), GNUNET_PQ_query_param_timestamp (&deposit->refund_deadline), GNUNET_PQ_query_param_timestamp (&deposit->wire_deadline), diff --git a/src/exchangedb/pg_insert_drain_profit.c b/src/exchangedb/pg_insert_drain_profit.c index 26dcb9d0f..a0de02e9b 100644 --- a/src/exchangedb/pg_insert_drain_profit.c +++ b/src/exchangedb/pg_insert_drain_profit.c @@ -41,8 +41,8 @@ TEH_PG_insert_drain_profit ( GNUNET_PQ_query_param_string (account_section), GNUNET_PQ_query_param_string (payto_uri), GNUNET_PQ_query_param_timestamp (&request_timestamp), - TALER_PQ_query_param_amount_tuple (pg->conn, - amount), + TALER_PQ_query_param_amount (pg->conn, + amount), GNUNET_PQ_query_param_auto_from_type (master_sig), GNUNET_PQ_query_param_end }; diff --git a/src/exchangedb/pg_insert_global_fee.c b/src/exchangedb/pg_insert_global_fee.c index 0b5406492..e78cd0b83 100644 --- a/src/exchangedb/pg_insert_global_fee.c +++ b/src/exchangedb/pg_insert_global_fee.c @@ -40,12 +40,12 @@ TEH_PG_insert_global_fee (void *cls, struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_timestamp (&start_date), GNUNET_PQ_query_param_timestamp (&end_date), - TALER_PQ_query_param_amount_tuple (pg->conn, - &fees->history), - TALER_PQ_query_param_amount_tuple (pg->conn, - &fees->account), - TALER_PQ_query_param_amount_tuple (pg->conn, - &fees->purse), + TALER_PQ_query_param_amount (pg->conn, + &fees->history), + TALER_PQ_query_param_amount (pg->conn, + &fees->account), + TALER_PQ_query_param_amount (pg->conn, + &fees->purse), GNUNET_PQ_query_param_relative_time (&purse_timeout), GNUNET_PQ_query_param_relative_time (&history_expiration), GNUNET_PQ_query_param_uint32 (&purse_account_limit), diff --git a/src/exchangedb/pg_insert_history_request.c b/src/exchangedb/pg_insert_history_request.c index 63a175de9..b13066b5c 100644 --- a/src/exchangedb/pg_insert_history_request.c +++ b/src/exchangedb/pg_insert_history_request.c @@ -41,8 +41,8 @@ TEH_PG_insert_history_request ( GNUNET_PQ_query_param_auto_from_type (reserve_pub), GNUNET_PQ_query_param_auto_from_type (reserve_sig), GNUNET_PQ_query_param_timestamp (&request_timestamp), - TALER_PQ_query_param_amount_tuple (pg->conn, - history_fee), + TALER_PQ_query_param_amount (pg->conn, + history_fee), GNUNET_PQ_query_param_end }; struct GNUNET_PQ_ResultSpec rs[] = { diff --git a/src/exchangedb/pg_insert_partner.c b/src/exchangedb/pg_insert_partner.c index 24c060051..d1d6069de 100644 --- a/src/exchangedb/pg_insert_partner.c +++ b/src/exchangedb/pg_insert_partner.c @@ -42,8 +42,8 @@ TEH_PG_insert_partner (void *cls, GNUNET_PQ_query_param_timestamp (&start_date), GNUNET_PQ_query_param_timestamp (&end_date), GNUNET_PQ_query_param_relative_time (&wad_frequency), - TALER_PQ_query_param_amount_tuple (pg->conn, - wad_fee), + TALER_PQ_query_param_amount (pg->conn, + wad_fee), GNUNET_PQ_query_param_auto_from_type (master_sig), GNUNET_PQ_query_param_string (partner_base_url), GNUNET_PQ_query_param_end diff --git a/src/exchangedb/pg_insert_purse_request.c b/src/exchangedb/pg_insert_purse_request.c index 05977b7b2..d8d68abe8 100644 --- a/src/exchangedb/pg_insert_purse_request.c +++ b/src/exchangedb/pg_insert_purse_request.c @@ -56,10 +56,10 @@ TEH_PG_insert_purse_request ( GNUNET_PQ_query_param_uint32 (&age_limit), GNUNET_PQ_query_param_uint32 (&flags32), GNUNET_PQ_query_param_bool (in_reserve_quota), - TALER_PQ_query_param_amount_tuple (pg->conn, - amount), - TALER_PQ_query_param_amount_tuple (pg->conn, - purse_fee), + TALER_PQ_query_param_amount (pg->conn, + amount), + TALER_PQ_query_param_amount (pg->conn, + purse_fee), GNUNET_PQ_query_param_auto_from_type (purse_sig), GNUNET_PQ_query_param_end }; diff --git a/src/exchangedb/pg_insert_records_by_table.c b/src/exchangedb/pg_insert_records_by_table.c index 97a7cdfb2..f7994e53c 100644 --- a/src/exchangedb/pg_insert_records_by_table.c +++ b/src/exchangedb/pg_insert_records_by_table.c @@ -74,19 +74,19 @@ irbt_cb_table_denominations (struct PostgresClosure *pg, &td->details.denominations.expire_deposit), GNUNET_PQ_query_param_timestamp ( &td->details.denominations.expire_legal), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.denominations.coin), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.denominations.fees.withdraw), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.denominations.fees.deposit), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.denominations.fees.refresh), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.denominations.fees.refund), GNUNET_PQ_query_param_end @@ -322,7 +322,7 @@ irbt_cb_table_reserves_in (struct PostgresClosure *pg, struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_uint64 (&td->serial), GNUNET_PQ_query_param_uint64 (&td->details.reserves_in.wire_reference), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.reserves_in.credit), GNUNET_PQ_query_param_auto_from_type ( @@ -370,7 +370,7 @@ irbt_cb_table_reserves_open_requests (struct PostgresClosure *pg, &td->details.reserves_open_requests.expiration_date), GNUNET_PQ_query_param_auto_from_type ( &td->details.reserves_open_requests.reserve_sig), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.reserves_open_requests.reserve_payment), GNUNET_PQ_query_param_uint32 ( @@ -415,7 +415,7 @@ irbt_cb_table_reserves_open_deposits ( &td->details.reserves_open_deposits.coin_sig), GNUNET_PQ_query_param_auto_from_type ( &td->details.reserves_open_deposits.reserve_sig), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.reserves_open_deposits.contribution), GNUNET_PQ_query_param_end @@ -456,10 +456,10 @@ irbt_cb_table_reserves_close (struct PostgresClosure *pg, &td->details.reserves_close.wtid), GNUNET_PQ_query_param_auto_from_type ( &td->details.reserves_close.sender_account_h_payto), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.reserves_close.amount), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.reserves_close.closing_fee), GNUNET_PQ_query_param_auto_from_type ( @@ -509,7 +509,7 @@ irbt_cb_table_reserves_out (struct PostgresClosure *pg, &td->details.reserves_out.reserve_sig), GNUNET_PQ_query_param_timestamp ( &td->details.reserves_out.execution_date), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.reserves_out.amount_with_fee), GNUNET_PQ_query_param_end @@ -731,7 +731,7 @@ irbt_cb_table_refresh_commitments (struct PostgresClosure *pg, GNUNET_PQ_query_param_auto_from_type (&td->details.refresh_commitments.rc), GNUNET_PQ_query_param_auto_from_type ( &td->details.refresh_commitments.old_coin_sig), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.refresh_commitments.amount_with_fee), GNUNET_PQ_query_param_uint32 ( @@ -870,7 +870,7 @@ irbt_cb_table_deposits (struct PostgresClosure *pg, GNUNET_PQ_query_param_uint64 (&td->details.deposits.known_coin_id), GNUNET_PQ_query_param_auto_from_type ( &td->details.deposits.coin_pub), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.deposits.amount_with_fee), GNUNET_PQ_query_param_timestamp (&td->details.deposits.wallet_timestamp), @@ -936,7 +936,7 @@ irbt_cb_table_refunds (struct PostgresClosure *pg, GNUNET_PQ_query_param_auto_from_type (&td->details.refunds.coin_pub), GNUNET_PQ_query_param_auto_from_type (&td->details.refunds.merchant_sig), GNUNET_PQ_query_param_uint64 (&td->details.refunds.rtransaction_id), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.refunds.amount_with_fee), GNUNET_PQ_query_param_uint64 (&td->details.refunds.deposit_serial_id), @@ -978,7 +978,7 @@ irbt_cb_table_wire_out (struct PostgresClosure *pg, &td->details.wire_out.wire_target_h_payto), GNUNET_PQ_query_param_string ( td->details.wire_out.exchange_account_section), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.wire_out.amount), GNUNET_PQ_query_param_end @@ -1049,10 +1049,10 @@ irbt_cb_table_wire_fee (struct PostgresClosure *pg, GNUNET_PQ_query_param_string (td->details.wire_fee.wire_method), GNUNET_PQ_query_param_timestamp (&td->details.wire_fee.start_date), GNUNET_PQ_query_param_timestamp (&td->details.wire_fee.end_date), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.wire_fee.fees.wire), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.wire_fee.fees.closing), GNUNET_PQ_query_param_auto_from_type (&td->details.wire_fee.master_sig), @@ -1094,13 +1094,13 @@ irbt_cb_table_global_fee (struct PostgresClosure *pg, &td->details.global_fee.start_date), GNUNET_PQ_query_param_timestamp ( &td->details.global_fee.end_date), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.global_fee.fees.history), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.global_fee.fees.account), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.global_fee.fees.purse), GNUNET_PQ_query_param_relative_time ( @@ -1149,7 +1149,7 @@ irbt_cb_table_recoup (struct PostgresClosure *pg, GNUNET_PQ_query_param_uint64 (&td->serial), GNUNET_PQ_query_param_auto_from_type (&td->details.recoup.coin_sig), GNUNET_PQ_query_param_auto_from_type (&td->details.recoup.coin_blind), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.recoup.amount), GNUNET_PQ_query_param_timestamp (&td->details.recoup.timestamp), @@ -1192,7 +1192,7 @@ irbt_cb_table_recoup_refresh (struct PostgresClosure *pg, GNUNET_PQ_query_param_auto_from_type (&td->details.recoup_refresh.coin_sig), GNUNET_PQ_query_param_auto_from_type ( &td->details.recoup_refresh.coin_blind), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.recoup_refresh.amount), GNUNET_PQ_query_param_timestamp (&td->details.recoup_refresh.timestamp), @@ -1272,17 +1272,17 @@ irbt_cb_table_policy_details (struct PostgresClosure *pg, (td->details.policy_details.no_policy_json) ? GNUNET_PQ_query_param_null () : TALER_PQ_query_param_json (td->details.policy_details.policy_json), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.policy_details.commitment), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.policy_details.accumulated_total), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.policy_details.fee), - TALER_PQ_query_param_amount_tuple (pg->conn, - &td->details.policy_details.transferable), + TALER_PQ_query_param_amount (pg->conn, + &td->details.policy_details.transferable), GNUNET_PQ_query_param_timestamp (&td->details.policy_details.deadline), GNUNET_PQ_query_param_uint16 ( &td->details.policy_details.fulfillment_state), @@ -1380,10 +1380,10 @@ irbt_cb_table_purse_requests (struct PostgresClosure *pg, &td->details.purse_requests.h_contract_terms), GNUNET_PQ_query_param_uint32 (&td->details.purse_requests.age_limit), GNUNET_PQ_query_param_uint32 (&td->details.purse_requests.flags), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.purse_requests.amount_with_fee), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.purse_requests.purse_fee), GNUNET_PQ_query_param_auto_from_type ( @@ -1504,7 +1504,7 @@ irbt_cb_table_purse_deposits (struct PostgresClosure *pg, GNUNET_PQ_query_param_auto_from_type ( &td->details.purse_deposits.purse_pub), GNUNET_PQ_query_param_auto_from_type (&td->details.purse_deposits.coin_pub), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.purse_deposits.amount_with_fee), GNUNET_PQ_query_param_auto_from_type (&td->details.purse_deposits.coin_sig), @@ -1585,7 +1585,7 @@ irbt_cb_table_history_requests (struct PostgresClosure *pg, &td->details.history_requests.request_timestamp), GNUNET_PQ_query_param_auto_from_type ( &td->details.history_requests.reserve_sig), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.history_requests.history_fee), GNUNET_PQ_query_param_end @@ -1625,10 +1625,10 @@ irbt_cb_table_close_requests (struct PostgresClosure *pg, &td->details.close_requests.close_timestamp), GNUNET_PQ_query_param_auto_from_type ( &td->details.close_requests.reserve_sig), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.close_requests.close), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.close_requests.close_fee), GNUNET_PQ_query_param_string ( @@ -1668,7 +1668,7 @@ irbt_cb_table_wads_out (struct PostgresClosure *pg, GNUNET_PQ_query_param_uint64 (&td->serial), GNUNET_PQ_query_param_auto_from_type (&td->details.wads_out.wad_id), GNUNET_PQ_query_param_uint64 (&td->details.wads_out.partner_serial_id), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.wads_out.amount), GNUNET_PQ_query_param_timestamp (&td->details.wads_out.execution_time), @@ -1715,13 +1715,13 @@ irbt_cb_table_wads_out_entries (struct PostgresClosure *pg, &td->details.wads_out_entries.purse_expiration), GNUNET_PQ_query_param_timestamp ( &td->details.wads_out_entries.merge_timestamp), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.wads_out_entries.amount_with_fee), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.wads_out_entries.wad_fee), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.wads_out_entries.deposit_fees), GNUNET_PQ_query_param_auto_from_type ( @@ -1768,7 +1768,7 @@ irbt_cb_table_wads_in (struct PostgresClosure *pg, GNUNET_PQ_query_param_uint64 (&td->serial), GNUNET_PQ_query_param_auto_from_type (&td->details.wads_in.wad_id), GNUNET_PQ_query_param_string (td->details.wads_in.origin_exchange_url), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.wads_in.amount), GNUNET_PQ_query_param_timestamp (&td->details.wads_in.arrival_time), @@ -1813,13 +1813,13 @@ irbt_cb_table_wads_in_entries (struct PostgresClosure *pg, &td->details.wads_in_entries.purse_expiration), GNUNET_PQ_query_param_timestamp ( &td->details.wads_in_entries.merge_timestamp), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.wads_in_entries.amount_with_fee), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.wads_in_entries.wad_fee), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.wads_in_entries.deposit_fees), GNUNET_PQ_query_param_auto_from_type ( @@ -1872,7 +1872,7 @@ irbt_cb_table_profit_drains (struct PostgresClosure *pg, td->details.profit_drains.payto_uri), GNUNET_PQ_query_param_timestamp ( &td->details.profit_drains.trigger_date), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.profit_drains.amount), GNUNET_PQ_query_param_auto_from_type ( @@ -1958,7 +1958,7 @@ irbt_cb_table_aml_history (struct PostgresClosure *pg, GNUNET_PQ_query_param_uint64 (&td->serial), GNUNET_PQ_query_param_auto_from_type ( &td->details.aml_history.h_payto), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.aml_history.new_threshold), GNUNET_PQ_query_param_uint32 ( @@ -2095,7 +2095,7 @@ irbt_cb_table_age_withdraw (struct PostgresClosure *pg, GNUNET_PQ_query_param_uint64 (&td->serial), GNUNET_PQ_query_param_auto_from_type ( &td->details.age_withdraw.h_commitment), - TALER_PQ_query_param_amount_tuple ( + TALER_PQ_query_param_amount ( pg->conn, &td->details.age_withdraw.amount_with_fee), GNUNET_PQ_query_param_uint16 ( diff --git a/src/exchangedb/pg_insert_refund.c b/src/exchangedb/pg_insert_refund.c index 9d35cbfd4..05f8a25b7 100644 --- a/src/exchangedb/pg_insert_refund.c +++ b/src/exchangedb/pg_insert_refund.c @@ -37,8 +37,8 @@ TEH_PG_insert_refund (void *cls, GNUNET_PQ_query_param_auto_from_type (&refund->details.merchant_sig), GNUNET_PQ_query_param_auto_from_type (&refund->details.h_contract_terms), GNUNET_PQ_query_param_uint64 (&refund->details.rtransaction_id), - TALER_PQ_query_param_amount_tuple (pg->conn, - &refund->details.refund_amount), + TALER_PQ_query_param_amount (pg->conn, + &refund->details.refund_amount), GNUNET_PQ_query_param_end }; diff --git a/src/exchangedb/pg_insert_reserve_closed.c b/src/exchangedb/pg_insert_reserve_closed.c index 58322fe92..6644fb892 100644 --- a/src/exchangedb/pg_insert_reserve_closed.c +++ b/src/exchangedb/pg_insert_reserve_closed.c @@ -51,10 +51,10 @@ TEH_PG_insert_reserve_closed ( GNUNET_PQ_query_param_timestamp (&execution_date), GNUNET_PQ_query_param_auto_from_type (wtid), GNUNET_PQ_query_param_auto_from_type (&h_payto), - TALER_PQ_query_param_amount_tuple (pg->conn, - amount_with_fee), - TALER_PQ_query_param_amount_tuple (pg->conn, - closing_fee), + TALER_PQ_query_param_amount (pg->conn, + amount_with_fee), + TALER_PQ_query_param_amount (pg->conn, + closing_fee), GNUNET_PQ_query_param_uint64 (&close_request_row), GNUNET_PQ_query_param_end }; diff --git a/src/exchangedb/pg_insert_reserve_open_deposit.c b/src/exchangedb/pg_insert_reserve_open_deposit.c index 25fbcbde9..f9cedcbe7 100644 --- a/src/exchangedb/pg_insert_reserve_open_deposit.c +++ b/src/exchangedb/pg_insert_reserve_open_deposit.c @@ -44,8 +44,8 @@ TEH_PG_insert_reserve_open_deposit ( GNUNET_PQ_query_param_auto_from_type (coin_sig), GNUNET_PQ_query_param_auto_from_type (reserve_sig), GNUNET_PQ_query_param_auto_from_type (reserve_pub), - TALER_PQ_query_param_amount_tuple (pg->conn, - coin_total), + TALER_PQ_query_param_amount (pg->conn, + coin_total), GNUNET_PQ_query_param_end }; struct GNUNET_PQ_ResultSpec rs[] = { diff --git a/src/exchangedb/pg_insert_wire_fee.c b/src/exchangedb/pg_insert_wire_fee.c index b6070c929..af818bcca 100644 --- a/src/exchangedb/pg_insert_wire_fee.c +++ b/src/exchangedb/pg_insert_wire_fee.c @@ -40,10 +40,10 @@ TEH_PG_insert_wire_fee (void *cls, GNUNET_PQ_query_param_string (type), GNUNET_PQ_query_param_timestamp (&start_date), GNUNET_PQ_query_param_timestamp (&end_date), - TALER_PQ_query_param_amount_tuple (pg->conn, - &fees->wire), - TALER_PQ_query_param_amount_tuple (pg->conn, - &fees->closing), + TALER_PQ_query_param_amount (pg->conn, + &fees->wire), + TALER_PQ_query_param_amount (pg->conn, + &fees->closing), GNUNET_PQ_query_param_auto_from_type (master_sig), GNUNET_PQ_query_param_end }; diff --git a/src/exchangedb/pg_lookup_auditor_timestamp.c b/src/exchangedb/pg_lookup_auditor_timestamp.c index 3a4bd6bed..eb85876fe 100644 --- a/src/exchangedb/pg_lookup_auditor_timestamp.c +++ b/src/exchangedb/pg_lookup_auditor_timestamp.c @@ -43,7 +43,7 @@ TEH_PG_lookup_auditor_timestamp ( GNUNET_PQ_result_spec_end }; - /* Used in #postgres_lookup_auditor_timestamp() */ + /* Used in #postgres_lookup_auditor_timestamp() */ PREPARE (pg, "lookup_auditor_timestamp", "SELECT" diff --git a/src/exchangedb/pg_persist_policy_details.c b/src/exchangedb/pg_persist_policy_details.c index 7db31039f..d97b92eac 100644 --- a/src/exchangedb/pg_persist_policy_details.c +++ b/src/exchangedb/pg_persist_policy_details.c @@ -39,14 +39,14 @@ TEH_PG_persist_policy_details ( GNUNET_PQ_query_param_auto_from_type (&details->hash_code), TALER_PQ_query_param_json (details->policy_json), GNUNET_PQ_query_param_timestamp (&details->deadline), - TALER_PQ_query_param_amount_tuple (pg->conn, - &details->commitment), - TALER_PQ_query_param_amount_tuple (pg->conn, - &details->accumulated_total), - TALER_PQ_query_param_amount_tuple (pg->conn, - &details->policy_fee), - TALER_PQ_query_param_amount_tuple (pg->conn, - &details->transferable_amount), + TALER_PQ_query_param_amount (pg->conn, + &details->commitment), + TALER_PQ_query_param_amount (pg->conn, + &details->accumulated_total), + TALER_PQ_query_param_amount (pg->conn, + &details->policy_fee), + TALER_PQ_query_param_amount (pg->conn, + &details->transferable_amount), GNUNET_PQ_query_param_auto_from_type (&details->fulfillment_state), (details->no_policy_fulfillment_id) ? GNUNET_PQ_query_param_null () diff --git a/src/exchangedb/pg_reserves_get.c b/src/exchangedb/pg_reserves_get.c index 5b487b860..cae4764a5 100644 --- a/src/exchangedb/pg_reserves_get.c +++ b/src/exchangedb/pg_reserves_get.c @@ -35,9 +35,9 @@ TEH_PG_reserves_get (void *cls, GNUNET_PQ_query_param_end }; struct GNUNET_PQ_ResultSpec rs[] = { - TALER_PQ_result_spec_amount_tuple ("current_balance", - pg->currency, - &reserve->balance), + TALER_PQ_result_spec_amount ("current_balance", + pg->currency, + &reserve->balance), GNUNET_PQ_result_spec_timestamp ("expiration_date", &reserve->expiry), GNUNET_PQ_result_spec_timestamp ("gc_date", diff --git a/src/exchangedb/pg_reserves_in_insert.c b/src/exchangedb/pg_reserves_in_insert.c index ff33a2f11..b2d547812 100644 --- a/src/exchangedb/pg_reserves_in_insert.c +++ b/src/exchangedb/pg_reserves_in_insert.c @@ -100,7 +100,7 @@ struct ReserveRecord #define RR_QUERY_PARAM(rr,index) \ GNUNET_PQ_query_param_auto_from_type (rr[index].reserve->reserve_pub), \ GNUNET_PQ_query_param_uint64 (&rr[index].reserve->wire_reference), \ - TALER_PQ_query_param_amount_tuple (pg->conn, rr[index].reserve->balance), \ + TALER_PQ_query_param_amount (pg->conn, rr[index].reserve->balance), \ GNUNET_PQ_query_param_string (rr[index].reserve->exchange_account_name), \ GNUNET_PQ_query_param_timestamp (&rr[index].reserve->execution_time), \ GNUNET_PQ_query_param_auto_from_type (&rr[index].h_payto), \ @@ -537,8 +537,8 @@ transact ( GNUNET_PQ_query_param_auto_from_type (rr[i].reserve->reserve_pub), GNUNET_PQ_query_param_timestamp (&reserve_expiration), GNUNET_PQ_query_param_uint64 (&rr[i].reserve->wire_reference), - TALER_PQ_query_param_amount_tuple (pg->conn, - rr[i].reserve->balance), + TALER_PQ_query_param_amount (pg->conn, + rr[i].reserve->balance), GNUNET_PQ_query_param_string (rr[i].reserve->exchange_account_name), GNUNET_PQ_query_param_auto_from_type (&rr[i].h_payto), GNUNET_PQ_query_param_string (rr[i].notify_s), @@ -860,8 +860,8 @@ TEH_PG_reserves_in_insertN ( GNUNET_PQ_query_param_auto_from_type (reserve_pubs[i]), GNUNET_PQ_query_param_timestamp (&reserve_expiration), GNUNET_PQ_query_param_uint64 (&wire_reference[i]), - TALER_PQ_query_param_amount_tuple (pg->conn, - balances[i]), + TALER_PQ_query_param_amount (pg->conn, + balances[i]), GNUNET_PQ_query_param_string (exchange_account_names[i]), GNUNET_PQ_query_param_auto_from_type (h_paytos[i]), GNUNET_PQ_query_param_string (notify_s[i]), diff --git a/src/exchangedb/pg_reserves_update.c b/src/exchangedb/pg_reserves_update.c index ecec81fc0..bfd32c6ce 100644 --- a/src/exchangedb/pg_reserves_update.c +++ b/src/exchangedb/pg_reserves_update.c @@ -33,8 +33,8 @@ TEH_PG_reserves_update (void *cls, struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_timestamp (&reserve->expiry), GNUNET_PQ_query_param_timestamp (&reserve->gc), - TALER_PQ_query_param_amount_tuple (pg->conn, - &reserve->balance), + TALER_PQ_query_param_amount (pg->conn, + &reserve->balance), GNUNET_PQ_query_param_auto_from_type (&reserve->pub), GNUNET_PQ_query_param_end }; diff --git a/src/exchangedb/pg_rollback.c b/src/exchangedb/pg_rollback.c index 6b200b55d..3610487f3 100644 --- a/src/exchangedb/pg_rollback.c +++ b/src/exchangedb/pg_rollback.c @@ -48,5 +48,3 @@ TEH_PG_rollback (void *cls) es)); pg->transaction_name = NULL; } - - diff --git a/src/exchangedb/pg_select_reserve_close_info.c b/src/exchangedb/pg_select_reserve_close_info.c index 06e8dda2e..eccba8e4c 100644 --- a/src/exchangedb/pg_select_reserve_close_info.c +++ b/src/exchangedb/pg_select_reserve_close_info.c @@ -39,9 +39,9 @@ TEH_PG_select_reserve_close_info ( GNUNET_PQ_query_param_end }; struct GNUNET_PQ_ResultSpec rs[] = { - TALER_PQ_result_spec_amount_tuple ("current_balance", - pg->currency, - balance), + TALER_PQ_result_spec_amount ("current_balance", + pg->currency, + balance), GNUNET_PQ_result_spec_string ("payto_uri", payto_uri), GNUNET_PQ_result_spec_end diff --git a/src/exchangedb/pg_set_purse_balance.c b/src/exchangedb/pg_set_purse_balance.c index ef8673f99..1e34ea6ed 100644 --- a/src/exchangedb/pg_set_purse_balance.c +++ b/src/exchangedb/pg_set_purse_balance.c @@ -35,8 +35,8 @@ TEH_PG_set_purse_balance ( struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (purse_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/exchangedb/pg_start.c b/src/exchangedb/pg_start.c index 395b87733..de5d698f6 100644 --- a/src/exchangedb/pg_start.c +++ b/src/exchangedb/pg_start.c @@ -28,7 +28,7 @@ enum GNUNET_GenericReturnValue TEH_PG_start (void *cls, - const char *name) + const char *name) { struct PostgresClosure *pg = cls; struct GNUNET_PQ_ExecuteStatement es[] = { @@ -54,4 +54,3 @@ TEH_PG_start (void *cls, pg->transaction_name = name; return GNUNET_OK; } - diff --git a/src/exchangedb/pg_store_wire_transfer_out.c b/src/exchangedb/pg_store_wire_transfer_out.c index c899a487e..337dc5855 100644 --- a/src/exchangedb/pg_store_wire_transfer_out.c +++ b/src/exchangedb/pg_store_wire_transfer_out.c @@ -40,8 +40,8 @@ TEH_PG_store_wire_transfer_out ( GNUNET_PQ_query_param_auto_from_type (wtid), GNUNET_PQ_query_param_auto_from_type (h_payto), GNUNET_PQ_query_param_string (exchange_account_section), - TALER_PQ_query_param_amount_tuple (pg->conn, - amount), + TALER_PQ_query_param_amount (pg->conn, + amount), GNUNET_PQ_query_param_end }; diff --git a/src/exchangedb/pg_trigger_aml_process.c b/src/exchangedb/pg_trigger_aml_process.c index a46b41476..0450eb713 100644 --- a/src/exchangedb/pg_trigger_aml_process.c +++ b/src/exchangedb/pg_trigger_aml_process.c @@ -35,8 +35,8 @@ TEH_PG_trigger_aml_process ( struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (h_payto), - TALER_PQ_query_param_amount_tuple (pg->conn, - threshold_crossed), + TALER_PQ_query_param_amount (pg->conn, + threshold_crossed), GNUNET_PQ_query_param_end }; diff --git a/src/exchangedb/pg_update_aggregation_transient.c b/src/exchangedb/pg_update_aggregation_transient.c index 06c768823..38b65316e 100644 --- a/src/exchangedb/pg_update_aggregation_transient.c +++ b/src/exchangedb/pg_update_aggregation_transient.c @@ -36,8 +36,8 @@ TEH_PG_update_aggregation_transient ( { struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { - TALER_PQ_query_param_amount_tuple (pg->conn, - total), + TALER_PQ_query_param_amount (pg->conn, + total), GNUNET_PQ_query_param_auto_from_type (h_payto), GNUNET_PQ_query_param_auto_from_type (wtid), GNUNET_PQ_query_param_uint64 (&kyc_requirement_row), |