diff options
Diffstat (limited to 'src/backenddb/plugin_merchantdb_postgres.c')
| -rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 51 |
1 files changed, 28 insertions, 23 deletions
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index 36e9ce82..6c87eea5 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -4350,13 +4350,13 @@ postgres_insert_reserve (void *cls, check_connection (pg); RETRY: if (MAX_RETRIES < ++retries) - return TALER_EC_TIP_PICKUP_DB_ERROR_SOFT; + return TALER_EC_GENERIC_DB_SOFT_FAILURE; if (GNUNET_OK != postgres_start (pg, "insert reserve")) { GNUNET_break (0); - return TALER_EC_TIP_PICKUP_DB_ERROR_HARD; + return TALER_EC_GENERIC_DB_START_FAILED; } /* Setup reserve */ @@ -5064,7 +5064,7 @@ lookup_reserve_for_tip_cb (void *cls, i)) { GNUNET_break (0); - lac->ec = TALER_EC_TIP_LOOKUP_RESERVE_DB_FAILURE; + lac->ec = TALER_EC_GENERIC_DB_FETCH_FAILED; return; } if (0 > @@ -5105,15 +5105,15 @@ lookup_reserve_for_tip_cb (void *cls, * @param[out] tip_id set to the unique ID for the tip * @param[out] expiration set to when the tip expires * @return transaction status, - * #TALER_EC_TIP_AUTHORIZE_RESERVE_EXPIRED if the reserve is known but has expired + * #TALER_EC_MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_RESERVE_EXPIRED if the reserve is known but has expired * #TALER_EC_TIP_AUTHORIZE_RESERVE_NOT_FOUND if the reserve is not known - * #TALER_EC_TIP_AUTHORIZE_INSUFFICIENT_FUNDS if the reserve has insufficient funds left - * #TALER_EC_TIP_AUTHORIZE_DB_START_FAILURE on hard DB errors - * #TALER_EC_TIP_AUTHORIZE_DB_LOOKUP_RESERVE_FAILURE on hard DB errors - * #TALER_EC_TIP_AUTHORIZE_DB_UPDATE_RESERVE_FAILURE on hard DB errors - * #TALER_EC_TIP_AUTHORIZE_DB_RESERVE_INVARIANT_FAILURE on hard DB errors - * #TALER_EC_TIP_AUTHORIZE_DB_START_FAILURE on hard DB errors - * #TALER_EC_TIP_AUTHORIZE_DB_SERIALIZATION_FAILURE on soft DB errors (client should retry) + * #TALER_EC_MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_INSUFFICIENT_FUNDS if the reserve has insufficient funds left + * #TALER_EC_GENERIC_DB_START_FAILED on hard DB errors + * #TALER_EC_GENERIC_DB_FETCH_FAILED on hard DB errors + * #TALER_EC_GENERIC_DB_STORE_FAILED on hard DB errors + * #TALER_EC_GENERIC_DB_INVARIANT_FAILURE on hard DB errors + * #TALER_EC_GENERIC_DB_START_FAILED on hard DB errors + * #TALER_EC_GENERIC_DB_SOFT_FAILURE soft DB errors (client should retry) * #TALER_EC_NONE upon success */ static enum TALER_ErrorCode @@ -5144,14 +5144,15 @@ RETRY: if (MAX_RETRIES < ++retries) { GNUNET_break (0); - return TALER_EC_TIP_AUTHORIZE_DB_SERIALIZATION_FAILURE; + return + TALER_EC_GENERIC_DB_SOFT_FAILURE; } if (GNUNET_OK != postgres_start (pg, "enable tip reserve")) { GNUNET_break (0); - return TALER_EC_TIP_AUTHORIZE_DB_START_FAILURE; + return TALER_EC_GENERIC_DB_START_FAILED; } if (NULL == reserve_pubp) { @@ -5175,18 +5176,19 @@ RETRY: { GNUNET_break (0); postgres_rollback (pg); - return TALER_EC_TIP_AUTHORIZE_DB_LOOKUP_RESERVE_FAILURE; + return + TALER_EC_GENERIC_DB_FETCH_FAILED; } if (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us == lac.expiration.abs_value_us) { postgres_rollback (pg); - return TALER_EC_TIP_AUTHORIZE_DB_RESERVE_NOT_FOUND; + return TALER_EC_MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_RESERVE_NOT_FOUND; } if (0 == GNUNET_TIME_absolute_get_remaining (lac.expiration).rel_value_us) { postgres_rollback (pg); - return TALER_EC_TIP_AUTHORIZE_DB_RESERVE_EXPIRED; + return TALER_EC_MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_RESERVE_EXPIRED; } reserve_pubp = &lac.reserve_pub; } @@ -5220,13 +5222,14 @@ RETRY: { GNUNET_break (0); postgres_rollback (pg); - return TALER_EC_TIP_AUTHORIZE_DB_LOOKUP_RESERVE_FAILURE; + return + TALER_EC_GENERIC_DB_FETCH_FAILED; } if (qs == 0) { GNUNET_break (0); postgres_rollback (pg); - return TALER_EC_TIP_AUTHORIZE_DB_RESERVE_NOT_FOUND; + return TALER_EC_MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_RESERVE_NOT_FOUND; } } { @@ -5239,14 +5242,15 @@ RETRY: { GNUNET_break (0); postgres_rollback (pg); - return TALER_EC_TIP_AUTHORIZE_DB_RESERVE_INVARIANT_FAILURE; + return + TALER_EC_GENERIC_DB_INVARIANT_FAILURE; } if (0 > TALER_amount_cmp (&remaining, amount)) { postgres_rollback (pg); - return TALER_EC_TIP_AUTHORIZE_INSUFFICIENT_FUNDS; + return TALER_EC_MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_INSUFFICIENT_FUNDS; } } GNUNET_assert (0 <= @@ -5273,7 +5277,8 @@ RETRY: { GNUNET_break (0); postgres_rollback (pg); - return TALER_EC_TIP_AUTHORIZE_DB_UPDATE_RESERVE_FAILURE; + return + TALER_EC_GENERIC_DB_STORE_FAILED; } } GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE, @@ -5303,7 +5308,7 @@ RETRY: { GNUNET_break (0); postgres_rollback (pg); - return TALER_EC_TIP_AUTHORIZE_DB_UPDATE_RESERVE_FAILURE; + return TALER_EC_GENERIC_DB_STORE_FAILED; } } qs = postgres_commit (pg); @@ -5313,7 +5318,7 @@ RETRY: { GNUNET_break (0); postgres_rollback (pg); - return TALER_EC_TIP_AUTHORIZE_DB_UPDATE_RESERVE_FAILURE; + return TALER_EC_GENERIC_DB_COMMIT_FAILED; } return TALER_EC_NONE; } |