diff options
Diffstat (limited to 'src/backenddb/plugin_merchantdb_postgres.c')
| -rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index 827874d4..ac180443 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -1224,9 +1224,9 @@ postgres_lookup_orders (void *cls, enum GNUNET_DB_QueryStatus qs; char stmt[128]; - paid = (TALER_MERCHANTDB_YNA_YES == of->paid); - refunded = (TALER_MERCHANTDB_YNA_YES == of->refunded); - wired = (TALER_MERCHANTDB_YNA_YES == of->wired); + paid = (TALER_EXCHANGE_YNA_YES == of->paid); + refunded = (TALER_EXCHANGE_YNA_YES == of->refunded); + wired = (TALER_EXCHANGE_YNA_YES == of->wired); /* painfully many cases..., note that "_xxx" being present in 'stmt' merely means that we filter by that variable, the value we filter for is computed above */ @@ -1234,10 +1234,10 @@ postgres_lookup_orders (void *cls, sizeof (stmt), "lookup_orders_%s%s%s%s", (of->delta > 0) ? "inc" : "dec", - (TALER_MERCHANTDB_YNA_ALL == of->paid) ? "" : "_paid", - (TALER_MERCHANTDB_YNA_ALL == of->refunded) ? "" : + (TALER_EXCHANGE_YNA_ALL == of->paid) ? "" : "_paid", + (TALER_EXCHANGE_YNA_ALL == of->refunded) ? "" : "_refunded", - (TALER_MERCHANTDB_YNA_ALL == of->wired) ? "" : "_wired"); + (TALER_EXCHANGE_YNA_ALL == of->wired) ? "" : "_wired"); qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn, stmt, params, @@ -3858,7 +3858,7 @@ struct LookupTransfersContext /** * Filter to apply by verification status. */ - enum TALER_MERCHANTDB_YesNoAll verified; + enum TALER_EXCHANGE_YesNoAll verified; }; @@ -3886,7 +3886,7 @@ lookup_transfers_cb (void *cls, char *exchange_url; uint64_t transfer_serial_id; struct GNUNET_TIME_Absolute execution_time; - enum TALER_MERCHANTDB_YesNoAll verified; + enum TALER_EXCHANGE_YesNoAll verified; uint8_t verified8; uint8_t confirmed8; struct GNUNET_PQ_ResultSpec rs[] = { @@ -3919,10 +3919,10 @@ lookup_transfers_cb (void *cls, return; } if (0 == verified8) - verified = TALER_MERCHANTDB_YNA_NO; + verified = TALER_EXCHANGE_YNA_NO; else - verified = TALER_MERCHANTDB_YNA_YES; - if ( (ltc->verified == TALER_MERCHANTDB_YNA_ALL) || + verified = TALER_EXCHANGE_YNA_YES; + if ( (ltc->verified == TALER_EXCHANGE_YNA_ALL) || (ltc->verified == verified) ) { ltc->qs = i + 1; @@ -3933,7 +3933,7 @@ lookup_transfers_cb (void *cls, exchange_url, transfer_serial_id, execution_time, - TALER_MERCHANTDB_YNA_YES == verified, + TALER_EXCHANGE_YNA_YES == verified, 0 != confirmed8); } GNUNET_PQ_cleanup_result (rs); @@ -3969,7 +3969,7 @@ postgres_lookup_transfers (void *cls, struct GNUNET_TIME_Absolute after, int64_t limit, uint64_t offset, - enum TALER_MERCHANTDB_YesNoAll verified, + enum TALER_EXCHANGE_YesNoAll verified, TALER_MERCHANTDB_TransferCallback cb, void *cb_cls) { @@ -4246,13 +4246,13 @@ struct LookupReservesContext /** * Filter by active reserves. */ - enum TALER_MERCHANTDB_YesNoAll active; + enum TALER_EXCHANGE_YesNoAll active; /** * Filter by failures (missmatch in exchange claimed and * merchant claimed initial amounts). */ - enum TALER_MERCHANTDB_YesNoAll failures; + enum TALER_EXCHANGE_YesNoAll failures; /** * Set in case of errors. @@ -4319,28 +4319,28 @@ lookup_reserves_cb (void *cls, } switch (lrc->active) { - case TALER_MERCHANTDB_YNA_YES: + case TALER_EXCHANGE_YNA_YES: if (! active) continue; - case TALER_MERCHANTDB_YNA_NO: + case TALER_EXCHANGE_YNA_NO: if (active) continue; - case TALER_MERCHANTDB_YNA_ALL: + case TALER_EXCHANGE_YNA_ALL: break; } switch (lrc->failures) { - case TALER_MERCHANTDB_YNA_YES: + case TALER_EXCHANGE_YNA_YES: if (0 == TALER_amount_cmp (&merchant_initial_balance, &exchange_initial_balance)) continue; - case TALER_MERCHANTDB_YNA_NO: + case TALER_EXCHANGE_YNA_NO: if (0 != TALER_amount_cmp (&merchant_initial_balance, &exchange_initial_balance)) continue; - case TALER_MERCHANTDB_YNA_ALL: + case TALER_EXCHANGE_YNA_ALL: break; } lrc->cb (lrc->cb_cls, @@ -4372,8 +4372,8 @@ static enum GNUNET_DB_QueryStatus postgres_lookup_reserves (void *cls, const char *instance_id, struct GNUNET_TIME_Absolute created_after, - enum TALER_MERCHANTDB_YesNoAll active, - enum TALER_MERCHANTDB_YesNoAll failures, + enum TALER_EXCHANGE_YesNoAll active, + enum TALER_EXCHANGE_YesNoAll failures, TALER_MERCHANTDB_ReservesCallback cb, void *cb_cls) { @@ -5246,7 +5246,7 @@ lookup_tips_cb (void *cls, static enum GNUNET_DB_QueryStatus postgres_lookup_tips (void *cls, const char *instance_id, - enum TALER_MERCHANTDB_YesNoAll expired, + enum TALER_EXCHANGE_YesNoAll expired, int64_t limit, uint64_t offset, TALER_MERCHANTDB_TipsCallback cb, @@ -5272,12 +5272,12 @@ postgres_lookup_tips (void *cls, enum GNUNET_DB_QueryStatus qs; char stmt[128]; - bexpired = (TALER_MERCHANTDB_YNA_YES == expired); + bexpired = (TALER_EXCHANGE_YNA_YES == expired); GNUNET_snprintf (stmt, sizeof (stmt), "lookup_tips_%s%s", (limit > 0) ? "inc" : "dec", - (TALER_MERCHANTDB_YNA_ALL == expired) ? "" : "_expired"); + (TALER_EXCHANGE_YNA_ALL == expired) ? "" : "_expired"); qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn, stmt, params, |