commit d040c9f85345dc488dc71ccab664de323bec3ed6
parent 3dd66dac0d73ed69c9d7cab28091574795ae3f5a
Author: Christian Grothoff <christian@grothoff.org>
Date: Thu, 26 Mar 2026 00:08:38 +0100
some DCE
Diffstat:
8 files changed, 0 insertions(+), 103 deletions(-)
diff --git a/src/include/taler/taler-merchant/post-orders-ORDER_ID-paid.h b/src/include/taler/taler-merchant/post-orders-ORDER_ID-paid.h
@@ -35,11 +35,6 @@ enum TALER_MERCHANT_PostOrdersPaidOption
*/
TALER_MERCHANT_POST_ORDERS_PAID_OPTION_END = 0,
- /**
- * Hash of wallet-specific data.
- */
- TALER_MERCHANT_POST_ORDERS_PAID_OPTION_WALLET_DATA_HASH
-
};
@@ -60,12 +55,6 @@ struct TALER_MERCHANT_PostOrdersPaidOptionValue
union
{
- /**
- * Value if @e option is
- * #TALER_MERCHANT_POST_ORDERS_PAID_OPTION_WALLET_DATA_HASH.
- */
- const struct GNUNET_HashCode *wallet_data_hash;
-
} details;
};
@@ -128,19 +117,6 @@ struct TALER_MERCHANT_PostOrdersPaidResponse
.option = TALER_MERCHANT_POST_ORDERS_PAID_OPTION_END \
}
-/**
- * Set hash of wallet-specific data.
- *
- * @param h hash of wallet data, or NULL
- * @return representation of the option as a struct TALER_MERCHANT_PostOrdersPaidOptionValue
- */
-#define TALER_MERCHANT_post_orders_paid_option_wallet_data_hash(h) \
- (const struct TALER_MERCHANT_PostOrdersPaidOptionValue) \
- { \
- .option = TALER_MERCHANT_POST_ORDERS_PAID_OPTION_WALLET_DATA_HASH, \
- .details.wallet_data_hash = (h) \
- }
-
/**
* Set the requested options for the operation.
diff --git a/src/lib/merchant_api_delete-private-otp-devices-DEVICE_ID.c b/src/lib/merchant_api_delete-private-otp-devices-DEVICE_ID.c
@@ -108,10 +108,6 @@ handle_delete_otp_device_finished (void *cls,
dor.hr.ec = TALER_JSON_get_error_code (json);
dor.hr.hint = TALER_JSON_get_error_hint (json);
break;
- case MHD_HTTP_CONFLICT:
- dor.hr.ec = TALER_JSON_get_error_code (json);
- dor.hr.hint = TALER_JSON_get_error_hint (json);
- break;
default:
dor.hr.ec = TALER_JSON_get_error_code (json);
dor.hr.hint = TALER_JSON_get_error_hint (json);
diff --git a/src/lib/merchant_api_delete-private-templates-TEMPLATE_ID.c b/src/lib/merchant_api_delete-private-templates-TEMPLATE_ID.c
@@ -108,10 +108,6 @@ handle_delete_template_finished (void *cls,
dtr.hr.ec = TALER_JSON_get_error_code (json);
dtr.hr.hint = TALER_JSON_get_error_hint (json);
break;
- case MHD_HTTP_CONFLICT:
- dtr.hr.ec = TALER_JSON_get_error_code (json);
- dtr.hr.hint = TALER_JSON_get_error_hint (json);
- break;
default:
dtr.hr.ec = TALER_JSON_get_error_code (json);
dtr.hr.hint = TALER_JSON_get_error_hint (json);
diff --git a/src/lib/merchant_api_delete-private-webhooks-WEBHOOK_ID.c b/src/lib/merchant_api_delete-private-webhooks-WEBHOOK_ID.c
@@ -109,10 +109,6 @@ handle_delete_webhook_finished (void *cls,
dwr.hr.ec = TALER_JSON_get_error_code (json);
dwr.hr.hint = TALER_JSON_get_error_hint (json);
break;
- case MHD_HTTP_CONFLICT:
- dwr.hr.ec = TALER_JSON_get_error_code (json);
- dwr.hr.hint = TALER_JSON_get_error_hint (json);
- break;
default:
dwr.hr.ec = TALER_JSON_get_error_code (json);
dwr.hr.hint = TALER_JSON_get_error_hint (json);
diff --git a/src/lib/merchant_api_patch-private-otp-devices-DEVICE_ID.c b/src/lib/merchant_api_patch-private-otp-devices-DEVICE_ID.c
@@ -154,10 +154,6 @@ handle_patch_otp_device_finished (void *cls,
odr.hr.ec = TALER_JSON_get_error_code (json);
odr.hr.hint = TALER_JSON_get_error_hint (json);
break;
- case MHD_HTTP_CONFLICT:
- odr.hr.ec = TALER_JSON_get_error_code (json);
- odr.hr.hint = TALER_JSON_get_error_hint (json);
- break;
case MHD_HTTP_INTERNAL_SERVER_ERROR:
odr.hr.ec = TALER_JSON_get_error_code (json);
odr.hr.hint = TALER_JSON_get_error_hint (json);
diff --git a/src/lib/merchant_api_post-orders-ORDER_ID-paid.c b/src/lib/merchant_api_post-orders-ORDER_ID-paid.c
@@ -95,10 +95,6 @@ struct TALER_MERCHANT_PostOrdersPaidHandle
*/
struct TALER_MerchantSignatureP merchant_sig;
- /**
- * Optional hash of wallet-specific data.
- */
- const struct GNUNET_HashCode *wallet_data_hash;
};
@@ -166,19 +162,10 @@ handle_paid_finished (void *cls,
opr.hr.ec = TALER_JSON_get_error_code (json);
opr.hr.hint = TALER_JSON_get_error_hint (json);
break;
- case MHD_HTTP_CONFLICT:
- opr.hr.ec = TALER_JSON_get_error_code (json);
- opr.hr.hint = TALER_JSON_get_error_hint (json);
- break;
case MHD_HTTP_INTERNAL_SERVER_ERROR:
opr.hr.ec = TALER_JSON_get_error_code (json);
opr.hr.hint = TALER_JSON_get_error_hint (json);
break;
- case MHD_HTTP_SERVICE_UNAVAILABLE:
- TALER_MERCHANT_parse_error_details_ (json,
- response_code,
- &opr.hr);
- break;
default:
TALER_MERCHANT_parse_error_details_ (json,
response_code,
@@ -230,9 +217,6 @@ TALER_MERCHANT_post_orders_paid_set_options_ (
{
case TALER_MERCHANT_POST_ORDERS_PAID_OPTION_END:
return GNUNET_OK;
- case TALER_MERCHANT_POST_ORDERS_PAID_OPTION_WALLET_DATA_HASH:
- poph->wallet_data_hash = options[i].details.wallet_data_hash;
- break;
default:
GNUNET_break (0);
return GNUNET_SYSERR;
diff --git a/src/lib/merchant_api_post-orders-ORDER_ID-pay.c b/src/lib/merchant_api_post-orders-ORDER_ID-pay.c
@@ -357,10 +357,6 @@ handle_pay_finished (void *cls,
}
}
break;
- case MHD_HTTP_NOT_ACCEPTABLE:
- pr.hr.ec = TALER_JSON_get_error_code (json);
- pr.hr.hint = TALER_JSON_get_error_hint (json);
- break;
case MHD_HTTP_BAD_REQUEST:
pr.hr.ec = TALER_JSON_get_error_code (json);
pr.hr.hint = TALER_JSON_get_error_hint (json);
@@ -459,11 +455,6 @@ handle_pay_finished (void *cls,
response_code,
&pr.hr);
break;
- case MHD_HTTP_SERVICE_UNAVAILABLE:
- TALER_MERCHANT_parse_error_details_ (json,
- response_code,
- &pr.hr);
- break;
case MHD_HTTP_GATEWAY_TIMEOUT:
TALER_MERCHANT_parse_error_details_ (json,
response_code,
diff --git a/src/lib/merchant_api_post-private-transfers.c b/src/lib/merchant_api_post-private-transfers.c
@@ -142,44 +142,6 @@ handle_post_transfers_finished (void *cls,
ptr.hr.ec = TALER_JSON_get_error_code (json);
ptr.hr.hint = TALER_JSON_get_error_hint (json);
break;
- case MHD_HTTP_BAD_GATEWAY:
- ptr.hr.ec = TALER_JSON_get_error_code (json);
- ptr.hr.hint = TALER_JSON_get_error_hint (json);
- {
- uint32_t ehc;
- struct GNUNET_JSON_Specification ispec[] = {
- TALER_JSON_spec_ec ("exchange_code",
- &ptr.details.bad_gateway.exchange_ec),
- GNUNET_JSON_spec_uint32 ("exchange_http_status",
- &ehc),
- GNUNET_JSON_spec_end ()
- };
-
- if (GNUNET_OK !=
- GNUNET_JSON_parse (json,
- ispec,
- NULL, NULL))
- {
- GNUNET_break_op (0);
- ptr.details.bad_gateway.exchange_http_status = 0;
- ptr.details.bad_gateway.exchange_ec = TALER_EC_NONE;
- break;
- }
- else
- {
- ptr.details.bad_gateway.exchange_http_status
- = (unsigned int) ehc;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Exchange returned %u/%u\n",
- (unsigned int) ptr.details.bad_gateway.exchange_ec,
- (unsigned int) ehc);
- }
- }
- break;
- case MHD_HTTP_GATEWAY_TIMEOUT:
- ptr.hr.ec = TALER_JSON_get_error_code (json);
- ptr.hr.hint = TALER_JSON_get_error_hint (json);
- break;
default:
GNUNET_break_op (0);
TALER_MERCHANT_parse_error_details_ (json,
