update error codes

2 files changed, 24 insertions, 19 deletions

diff --git a/src/sync/sync-httpd_backup.c b/src/sync/sync-httpd_backup.c
index 396960f..801fc14 100644
--- a/src/sync/sync-httpd_backup.c
+++ b/src/sync/sync-httpd_backup.c
@@ -49,13 +49,13 @@ SH_backup_get (struct MHD_Connection *connection,
     GNUNET_break (0);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_INTERNAL_INVARIANT_FAILURE,
+                                       TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
                                        NULL);
   case SYNC_DB_OLD_BACKUP_MISMATCH:
     GNUNET_break (0);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_INTERNAL_INVARIANT_FAILURE,
+                                       TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
                                        NULL);
   case SYNC_DB_PAYMENT_REQUIRED:
     return TALER_MHD_reply_with_error (connection,
@@ -65,13 +65,13 @@ SH_backup_get (struct MHD_Connection *connection,
   case SYNC_DB_HARD_ERROR:
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_SYNC_DB_HARD_FETCH_ERROR,
+                                       TALER_EC_GENERIC_DB_FETCH_FAILED,
                                        NULL);
   case SYNC_DB_SOFT_ERROR:
     GNUNET_break (0);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_SYNC_DB_SOFT_FETCH_ERROR,
+                                       TALER_EC_GENERIC_DB_SOFT_FAILURE,
                                        NULL);
   case SYNC_DB_NO_RESULTS:
     {
@@ -173,31 +173,31 @@ SH_return_backup (struct MHD_Connection *connection,
     GNUNET_break (0);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_INTERNAL_INVARIANT_FAILURE,
+                                       TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
                                        "unexpected return status (backup missing)");
   case SYNC_DB_OLD_BACKUP_MISMATCH:
     GNUNET_break (0);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_INTERNAL_INVARIANT_FAILURE,
+                                       TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
                                        "unexpected return status (backup mismatch)");
   case SYNC_DB_PAYMENT_REQUIRED:
     GNUNET_break (0);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_INTERNAL_INVARIANT_FAILURE,
+                                       TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
                                        "unexpected return status (payment required)");
   case SYNC_DB_HARD_ERROR:
     GNUNET_break (0);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_SYNC_DB_HARD_FETCH_ERROR,
+                                       TALER_EC_GENERIC_DB_FETCH_FAILED,
                                        NULL);
   case SYNC_DB_SOFT_ERROR:
     GNUNET_break (0);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_SYNC_DB_SOFT_FETCH_ERROR,
+                                       TALER_EC_GENERIC_DB_SOFT_FAILURE,
                                        NULL);
   case SYNC_DB_NO_RESULTS:
     GNUNET_break (0);
@@ -207,7 +207,7 @@ SH_return_backup (struct MHD_Connection *connection,
        expensive. Just admit to failure ;-) */
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_SYNC_DB_INCONSISTENT_FETCH_ERROR,
+                                       TALER_EC_GENERIC_DB_INVARIANT_FAILURE,
                                        NULL);
   case SYNC_DB_ONE_RESULT:
     /* interesting case below */
diff --git a/src/sync/sync-httpd_backup_post.c b/src/sync/sync-httpd_backup_post.c
index 23872e5..d25d230 100644
--- a/src/sync/sync-httpd_backup_post.c
+++ b/src/sync/sync-httpd_backup_post.c
@@ -31,7 +31,7 @@
  * How long do we hold an HTTP client connection if
  * we are awaiting payment before giving up?
  */
-#define CHECK_PAYMENT_TIMEOUT GNUNET_TIME_relative_multiply ( \
+#define CHECK_PAYMENT_GENERIC_TIMEOUT GNUNET_TIME_relative_multiply ( \
     GNUNET_TIME_UNIT_MINUTES, 30)
 
 
@@ -358,7 +358,7 @@ proposal_cb (void *cls,
   if (0 >= qs)
   {
     GNUNET_break (0);
-    bc->resp = TALER_MHD_make_error (TALER_EC_SYNC_PAYMENT_CREATE_DB_ERROR,
+    bc->resp = TALER_MHD_make_error (TALER_EC_GENERIC_DB_STORE_FAILED,
                                      "Failed to persist payment request in sync database");
     GNUNET_assert (NULL != bc->resp);
     bc->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
@@ -446,8 +446,8 @@ check_payment_cb (void *cls,
       if (0 <= qs)
         return; /* continue as planned */
       GNUNET_break (0);
-      bc->resp = TALER_MHD_make_error (TALER_EC_SYNC_PAYMENT_CONFIRM_DB_ERROR,
-                                       "Failed to persist payment confirmation in sync database");
+      bc->resp = TALER_MHD_make_error (TALER_EC_GENERIC_DB_STORE_FAILED,
+                                       "increment lifetime");
       GNUNET_assert (NULL != bc->resp);
       bc->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
       return; /* continue as planned */
@@ -471,7 +471,7 @@ check_payment_cb (void *cls,
   }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Timeout waiting for payment\n");
-  bc->resp = TALER_MHD_make_error (TALER_EC_SYNC_PAYMENT_TIMEOUT,
+  bc->resp = TALER_MHD_make_error (TALER_EC_SYNC_PAYMENT_GENERIC_TIMEOUT,
                                    "Timeout awaiting promised payment");
   GNUNET_assert (NULL != bc->resp);
   bc->response_code = MHD_HTTP_REQUEST_TIMEOUT;
@@ -535,8 +535,8 @@ begin_payment (struct BackupContext *bc,
     struct MHD_Response *resp;
     MHD_RESULT ret;
 
-    resp = TALER_MHD_make_error (TALER_EC_SYNC_PAYMENT_CHECK_ORDER_DB_ERROR,
-                                 "Failed to check for existing orders in sync database");
+    resp = TALER_MHD_make_error (TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                 "pending payments");
     ret = MHD_queue_response (bc->con,
                               MHD_HTTP_INTERNAL_SERVER_ERROR,
                               resp);
@@ -629,16 +629,21 @@ handle_database_error (struct BackupContext *bc,
                   "Payment required, awaiting completion of `%s'\n",
                   order_id);
       await_payment (bc,
-                     CHECK_PAYMENT_TIMEOUT,
+                     CHECK_PAYMENT_GENERIC_TIMEOUT,
                      order_id);
     }
     return MHD_YES;
   case SYNC_DB_HARD_ERROR:
+    GNUNET_break (0);
+    return TALER_MHD_reply_with_error (bc->con,
+                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                       TALER_EC_GENERIC_DB_COMMIT_FAILED,
+                                       NULL);
   case SYNC_DB_SOFT_ERROR:
     GNUNET_break (0);
     return TALER_MHD_reply_with_error (bc->con,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_SYNC_DATABASE_FETCH_ERROR,
+                                       TALER_EC_GENERIC_DB_SOFT_FAILURE,
                                        NULL);
   case SYNC_DB_NO_RESULTS:
     GNUNET_assert (0);