diff options
| author | Florian Dold <florian@dold.me> | 2022-02-17 11:43:48 +0100 |
|---|---|---|
| committer | Florian Dold <florian@dold.me> | 2022-02-17 11:43:48 +0100 |
| commit | 1ec3eecef1318dd9c7b21c2d1a5b61dc6ae8e708 (patch) | |
| tree | 0e54a6215faf7f5ca6d70bcde96d578b77a5769a | |
| parent | ccb3e0f161df4e3c5d60e177237384cc8f6b4b79 (diff) | |
| download | merchant-1ec3eecef1318dd9c7b21c2d1a5b61dc6ae8e708.tar.gz merchant-1ec3eecef1318dd9c7b21c2d1a5b61dc6ae8e708.tar.bz2 merchant-1ec3eecef1318dd9c7b21c2d1a5b61dc6ae8e708.zip | |
fix exchange API breakage
| -rw-r--r-- | src/backend/taler-merchant-httpd_post-orders-ID-pay.c | 1 | ||||
| -rw-r--r-- | src/lib/merchant_api_post_order_pay.c | 1 | ||||
| -rw-r--r-- | src/lib/merchant_api_tip_pickup.c | 2 | ||||
| -rw-r--r-- | src/merchant-tools/taler-merchant-benchmark.c | 5 | ||||
| -rw-r--r-- | src/testing/testing_api_cmd_pay_order.c | 3 | ||||
| -rw-r--r-- | src/testing/testing_api_cmd_tip_pickup.c | 3 |
6 files changed, 13 insertions, 2 deletions
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c index bea47c4e..3f69cfaa 100644 --- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c +++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c @@ -1160,6 +1160,7 @@ process_pay_with_exchange (void *cls, &pc->wm->wire_salt, &pc->h_contract_terms, NULL, /* FIXME-Oec */ + NULL, /* FIXME-Oec */ &dc->coin_pub, &dc->ub_sig, &denom_details->key, diff --git a/src/lib/merchant_api_post_order_pay.c b/src/lib/merchant_api_post_order_pay.c index bb4e2ca6..15798797 100644 --- a/src/lib/merchant_api_post_order_pay.c +++ b/src/lib/merchant_api_post_order_pay.c @@ -619,6 +619,7 @@ TALER_MERCHANT_order_pay (struct GNUNET_CURL_Context *ctx, &fee, h_wire, h_contract_terms, + NULL /* h_age_commitment! */, NULL /* h_extensions! */, &h_denom_pub, timestamp, diff --git a/src/lib/merchant_api_tip_pickup.c b/src/lib/merchant_api_tip_pickup.c index 8118918b..d7609577 100644 --- a/src/lib/merchant_api_tip_pickup.c +++ b/src/lib/merchant_api_tip_pickup.c @@ -187,6 +187,7 @@ pickup_done_cb (void *cls, &blind_sigs[i], &pcd->bks, &pcd->coin_priv, + NULL, &tp->planchets[i].c_hash, &pcd->exchange_vals, &fc)) @@ -253,6 +254,7 @@ pickup_post_csr (struct TALER_MERCHANT_TipPickupHandle *tp) &pcd->exchange_vals, &pcd->bks, &pcd->coin_priv, + NULL, &tp->planchets[i].c_hash, &details[i])) { diff --git a/src/merchant-tools/taler-merchant-benchmark.c b/src/merchant-tools/taler-merchant-benchmark.c index 877eaa4b..d60cfeed 100644 --- a/src/merchant-tools/taler-merchant-benchmark.c +++ b/src/merchant-tools/taler-merchant-benchmark.c @@ -219,10 +219,12 @@ run (void *cls, TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-1", "create-reserve-1", CURRENCY_5, + 0, MHD_HTTP_OK), TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-2", "create-reserve-1", CURRENCY_5, + 0, MHD_HTTP_OK), TALER_TESTING_cmd_merchant_post_orders ("create-proposal-1", merchant_url, @@ -316,6 +318,7 @@ run (void *cls, TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-1", "create-reserve-1", CURRENCY_5, + 0, MHD_HTTP_OK), TALER_TESTING_cmd_merchant_post_orders ("create-unaggregated-proposal", alt_instance_url, @@ -344,10 +347,12 @@ run (void *cls, TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-2", "create-reserve-2", CURRENCY_5, + 0, MHD_HTTP_OK), TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-3", "create-reserve-2", CURRENCY_5, + 0, MHD_HTTP_OK), TALER_TESTING_cmd_merchant_post_orders ("create-twocoins-proposal", merchant_url, diff --git a/src/testing/testing_api_cmd_pay_order.c b/src/testing/testing_api_cmd_pay_order.c index 736b482c..5609cf07 100644 --- a/src/testing/testing_api_cmd_pay_order.c +++ b/src/testing/testing_api_cmd_pay_order.c @@ -189,7 +189,8 @@ build_coins (struct TALER_MERCHANT_PayCoin **pc, } GNUNET_assert (NULL != (dpk = TALER_TESTING_find_pk (is->keys, - &icoin->denom_value))); + &icoin->denom_value, + false))); GNUNET_assert (0 <= TALER_amount_subtract (&icoin->amount_without_fee, diff --git a/src/testing/testing_api_cmd_tip_pickup.c b/src/testing/testing_api_cmd_tip_pickup.c index c7dec778..76eac167 100644 --- a/src/testing/testing_api_cmd_tip_pickup.c +++ b/src/testing/testing_api_cmd_tip_pickup.c @@ -251,7 +251,8 @@ tip_pickup_run (void *cls, &tps->total_amount, &tps->amounts_obj[i])); tps->dks[i] = TALER_TESTING_find_pk (is->keys, - &tps->amounts_obj[i]); + &tps->amounts_obj[i], + false); if (NULL == tps->dks[i]) TALER_TESTING_FAIL (is); TALER_planchet_master_setup_random (&tps->psa[i]); |