From 5e1d3d01a3fdbff3d8583c6d3281bdd7171af1d2 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 25 May 2021 20:15:06 +0200 Subject: fix #6887/#6886: handle update in exchange API properly --- contrib/merchant-backoffice | 2 +- doc/prebuilt | 2 +- src/testing/test_merchant_api.c | 14 ++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice index 44873195..4320467d 160000 --- a/contrib/merchant-backoffice +++ b/contrib/merchant-backoffice @@ -1 +1 @@ -Subproject commit 44873195f90f3189cc3bdd25f728cfac7278a01d +Subproject commit 4320467db1392e5f48a4acd079f7e2a253cf9984 diff --git a/doc/prebuilt b/doc/prebuilt index e32c7da9..4739f144 160000 --- a/doc/prebuilt +++ b/doc/prebuilt @@ -1 +1 @@ -Subproject commit e32c7da994a3787ad34d99b21d2cbc12d6988166 +Subproject commit 4739f1447d0e8a6534c7fbdbc361d5d756d1875b diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c index 0292a521..65b987e4 100644 --- a/src/testing/test_merchant_api.c +++ b/src/testing/test_merchant_api.c @@ -961,7 +961,8 @@ run (void *cls, "EUR:20.04", &bc.exchange_auth, payer_payto, - "create-reserve-tip-1"), + "create-reserve-tip-1", + MHD_HTTP_OK), cmd_exec_wirewatch ("wirewatch-3"), TALER_TESTING_cmd_tip_authorize ("authorize-tip-1", merchant_url, @@ -972,7 +973,7 @@ run (void *cls, TALER_TESTING_cmd_tip_authorize_from_reserve ("authorize-tip-2", merchant_url, EXCHANGE_URL, - "create-reserve-tip-1", + "create-reserve-tip-1-exch", MHD_HTTP_OK, "tip 2", "EUR:5.01"), @@ -1008,16 +1009,16 @@ run (void *cls, TALER_TESTING_cmd_merchant_get_reserves ("get-reserves-1", merchant_url, MHD_HTTP_OK, - "create-reserve-tip-1", + "create-reserve-tip-1-exch", NULL), TALER_TESTING_cmd_merchant_get_reserve ("get-reserve-1", merchant_url, MHD_HTTP_OK, - "create-reserve-tip-1"), + "create-reserve-tip-1-exch"), TALER_TESTING_cmd_merchant_get_reserve_with_tips ("get-reserve-2", merchant_url, MHD_HTTP_OK, - "create-reserve-tip-1", + "create-reserve-tip-1-exch", "authorize-tip-1", "authorize-tip-2", NULL), @@ -1083,7 +1084,8 @@ run (void *cls, "EUR:1.04", &bc.exchange_auth, payer_payto, - "create-reserve-tip-2"), + "create-reserve-tip-2", + MHD_HTTP_OK), cmd_exec_wirewatch ("wirewatch-4"), TALER_TESTING_cmd_tip_authorize_from_reserve_with_ec ( "authorize-tip-insufficient-funds", -- cgit v1.2.3