diff options
| author | priscilla <priscilla.huang@efrei.net> | 2023-01-23 08:39:44 -0500 |
|---|---|---|
| committer | priscilla <priscilla.huang@efrei.net> | 2023-01-23 08:39:44 -0500 |
| commit | c541307441f8e50770919c0105264f4cf6676619 (patch) | |
| tree | fce476922d2e34b5e24f1e9396db7b84d926fc96 | |
| parent | 4ba9ffaaeef83a05964bee764c419d9006a6767d (diff) | |
update
| -rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 14 | ||||
| -rw-r--r-- | src/include/taler_merchantdb_plugin.h | 5 |
2 files changed, 3 insertions, 16 deletions
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index e87021ea..bf9faea0 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -7800,19 +7800,11 @@ postgres_lookup_all_webhooks (void *cls, * @param next_attempt when we should make the next request to the webhook * @return database result code */ -<<<<<<< HEAD static enum GNUNET_DB_QueryStatus -postgres_update_pending_webhook (void *cls, - uint64_t webhook_serial, - struct GNUNET_TIME_Absolute next_attempt) -// maybe add: http status of failure? -======= - static enum GNUNET_DB_QueryStatus - postgres_update_pending_webhook(void *cls, - uint64_t webhook_serial, - const struct TALER_MERCHANTDB_PendingWebhookDetails *pwb) +postgres_update_pending_webhook(void *cls, + uint64_t webhook_serial, + const struct TALER_MERCHANTDB_PendingWebhookDetails *pwb) // maybe add: http status of failure? ->>>>>>> ee56051c (backend for pending webhook) { struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h index 54432e52..434b82ef 100644 --- a/src/include/taler_merchantdb_plugin.h +++ b/src/include/taler_merchantdb_plugin.h @@ -2828,13 +2828,8 @@ struct TALER_MERCHANTDB_Plugin enum GNUNET_DB_QueryStatus (*update_pending_webhook)(void *cls, uint64_t webhook_serial, -<<<<<<< HEAD - struct GNUNET_TIME_Absolute next_attempt); - // maybe add: http status of failure? -======= const struct TALER_MERCHANTDB_PendingWebhookDetails *pwb); // maybe add: http status of failure? ->>>>>>> ee56051c (backend for pending webhook) /** |