summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2024-01-26 18:10:06 +0100
committerChristian Grothoff <christian@grothoff.org>2024-01-26 18:25:30 +0100
commit1e0d328f91e4aa2ad783725671bb20d3e8cc1ef4 (patch)
tree55377beef0ab40dd092feeb57a29c370d3cec4a7
parent0b85857fbae788fdec37b3ead0d1bbe7b4a3ea44 (diff)
downloadmerchant-1e0d328f91e4aa2ad783725671bb20d3e8cc1ef4.tar.gz
merchant-1e0d328f91e4aa2ad783725671bb20d3e8cc1ef4.tar.bz2
merchant-1e0d328f91e4aa2ad783725671bb20d3e8cc1ef4.zip
-fix check
-rw-r--r--src/backend/taler-merchant-depositcheck.c5
-rw-r--r--src/backend/taler-merchant-httpd_private-post-transfers.c2
-rw-r--r--src/backenddb/pg_update_deposit_confirmation_status.c4
-rw-r--r--src/backenddb/pg_update_deposit_confirmation_status.h2
4 files changed, 8 insertions, 5 deletions
diff --git a/src/backend/taler-merchant-depositcheck.c b/src/backend/taler-merchant-depositcheck.c
index c726d8d9..b472fd65 100644
--- a/src/backend/taler-merchant-depositcheck.c
+++ b/src/backend/taler-merchant-depositcheck.c
@@ -461,10 +461,13 @@ deposit_get_cb (void *cls,
future_retry
= GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Bumping wire transfer deadline in DB to %s as that is when we will retry\n",
+ GNUNET_TIME_absolute2s (future_retry));
qs = db_plugin->update_deposit_confirmation_status (
db_plugin->cls,
w->deposit_serial,
- future_retry,
+ GNUNET_TIME_absolute_to_timestamp (future_retry),
"Exchange reported 202 Accepted but no KYC block");
if (qs < 0)
{
diff --git a/src/backend/taler-merchant-httpd_private-post-transfers.c b/src/backend/taler-merchant-httpd_private-post-transfers.c
index 2fe46fbd..cf6eebaf 100644
--- a/src/backend/taler-merchant-httpd_private-post-transfers.c
+++ b/src/backend/taler-merchant-httpd_private-post-transfers.c
@@ -92,7 +92,7 @@ TMH_private_post_transfers (const struct TMH_RequestHandler *rh,
&amount,
payto_uri,
true /* confirmed! */);
- if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == 0)
+ if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
qs = TMH_db->set_transfer_status_to_confirmed (TMH_db->cls,
hc->instance->settings.id,
exchange_url,
diff --git a/src/backenddb/pg_update_deposit_confirmation_status.c b/src/backenddb/pg_update_deposit_confirmation_status.c
index 61bda33b..0bc327cd 100644
--- a/src/backenddb/pg_update_deposit_confirmation_status.c
+++ b/src/backenddb/pg_update_deposit_confirmation_status.c
@@ -30,13 +30,13 @@ enum GNUNET_DB_QueryStatus
TMH_PG_update_deposit_confirmation_status (
void *cls,
uint64_t deposit_serial,
- struct GNUNET_TIME_Absolute future_retry,
+ struct GNUNET_TIME_Timestamp future_retry,
const char *emsg)
{
struct PostgresClosure *pg = cls;
struct GNUNET_PQ_QueryParam params[] = {
GNUNET_PQ_query_param_uint64 (&deposit_serial),
- GNUNET_PQ_query_param_absolute_time (&future_retry),
+ GNUNET_PQ_query_param_timestamp (&future_retry),
GNUNET_PQ_query_param_string (emsg),
GNUNET_PQ_query_param_end
};
diff --git a/src/backenddb/pg_update_deposit_confirmation_status.h b/src/backenddb/pg_update_deposit_confirmation_status.h
index 59526ad9..196e0f27 100644
--- a/src/backenddb/pg_update_deposit_confirmation_status.h
+++ b/src/backenddb/pg_update_deposit_confirmation_status.h
@@ -40,7 +40,7 @@ enum GNUNET_DB_QueryStatus
TMH_PG_update_deposit_confirmation_status (
void *cls,
uint64_t deposit_serial,
- struct GNUNET_TIME_Absolute future_retry,
+ struct GNUNET_TIME_Timestamp future_retry,
const char *emsg);