diff options
| -rw-r--r-- | src/lib/merchant_api_tip_pickup.c | 2 | ||||
| -rw-r--r-- | src/lib/test_merchant_api.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/merchant_api_tip_pickup.c b/src/lib/merchant_api_tip_pickup.c index 5bcae493..4e1df082 100644 --- a/src/lib/merchant_api_tip_pickup.c +++ b/src/lib/merchant_api_tip_pickup.c @@ -176,7 +176,7 @@ handle_tip_pickup_finished (void *cls, /* Server had an internal issue; we should retry, but this API leaves this to the application */ break; - case MHD_HTTP_SERVICE_UNAVAILABLE: + case MHD_HTTP_CONFLICT: /* legal, can happen if we pickup a tip twice... */ break; case MHD_HTTP_NOT_FOUND: diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c index 5bc6814d..26c08289 100644 --- a/src/lib/test_merchant_api.c +++ b/src/lib/test_merchant_api.c @@ -4359,7 +4359,7 @@ run (void *cls) .details.tip_authorize.expected_ec = TALER_EC_TIP_AUTHORIZE_INSTANCE_DOES_NOT_TIP }, { .oc = OC_TIP_PICKUP, .label = "pickup-tip-3-too-much", - .expected_response_code = MHD_HTTP_SERVICE_UNAVAILABLE, + .expected_response_code = MHD_HTTP_CONFLICT, .details.tip_pickup.expected_ec = TALER_EC_TIP_PICKUP_NO_FUNDS, .details.tip_pickup.authorize_ref = "authorize-tip-1", .details.tip_pickup.amounts = pickup_amounts_1 }, |