diff options
| author | Christian Grothoff <grothoff@gnunet.org> | 2022-03-10 02:35:22 +0100 |
|---|---|---|
| committer | Christian Grothoff <grothoff@gnunet.org> | 2022-03-10 02:35:22 +0100 |
| commit | e03d7255f55b517f174b1f0157a5d9e6c55f23ff (patch) | |
| tree | d784b37539bf88a4dec4fff7c36770f552e65307 | |
| parent | d7387e449eed5a730866a188c8df5f6401e207f7 (diff) | |
| download | sync-e03d7255f55b517f174b1f0157a5d9e6c55f23ff.tar.gz sync-e03d7255f55b517f174b1f0157a5d9e6c55f23ff.tar.bz2 sync-e03d7255f55b517f174b1f0157a5d9e6c55f23ff.zip | |
adapt to latest exchange
| -rw-r--r-- | src/lib/sync_api_upload.c | 72 | ||||
| -rw-r--r-- | src/testing/test_sync_api.c | 3 | ||||
| -rw-r--r-- | src/testing/test_sync_api.conf | 4 |
3 files changed, 43 insertions, 36 deletions
diff --git a/src/lib/sync_api_upload.c b/src/lib/sync_api_upload.c index 4ac5ee9..daaa2eb 100644 --- a/src/lib/sync_api_upload.c +++ b/src/lib/sync_api_upload.c @@ -356,46 +356,46 @@ SYNC_upload (struct GNUNET_CURL_Context *ctx, if (0 != (po & SYNC_PO_FRESH_ORDER)) { uo->url = (0 != (po & SYNC_PO_FORCE_PAYMENT)) - ? TALER_url_join (base_url, - path, - "fresh", - "y", - "pay", - "y", - (NULL != paid_order_id) - ? "paying" - : NULL, - paid_order_id, - NULL) - : TALER_url_join (base_url, - path, - "fresh", - "y", - (NULL != paid_order_id) - ? "paying" - : NULL, - paid_order_id, - NULL); + ? TALER_url_join (base_url, + path, + "fresh", + "y", + "pay", + "y", + (NULL != paid_order_id) + ? "paying" + : NULL, + paid_order_id, + NULL) + : TALER_url_join (base_url, + path, + "fresh", + "y", + (NULL != paid_order_id) + ? "paying" + : NULL, + paid_order_id, + NULL); } else { uo->url = (0 != (po & SYNC_PO_FORCE_PAYMENT)) - ? TALER_url_join (base_url, - path, - "pay", - "y", - (NULL != paid_order_id) - ? "paying" - : NULL, - paid_order_id, - NULL) - : TALER_url_join (base_url, - path, - (NULL != paid_order_id) - ? "paying" - : NULL, - paid_order_id, - NULL); + ? TALER_url_join (base_url, + path, + "pay", + "y", + (NULL != paid_order_id) + ? "paying" + : NULL, + paid_order_id, + NULL) + : TALER_url_join (base_url, + path, + (NULL != paid_order_id) + ? "paying" + : NULL, + paid_order_id, + NULL); } GNUNET_free (path); diff --git a/src/testing/test_sync_api.c b/src/testing/test_sync_api.c index a05b39a..0222cb0 100644 --- a/src/testing/test_sync_api.c +++ b/src/testing/test_sync_api.c @@ -165,6 +165,7 @@ run (void *cls, TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees", CONFIG_FILE, "EUR:0.01", + "EUR:0.01", "EUR:0.01"), TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys", 1), @@ -188,10 +189,12 @@ run (void *cls, TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-1", "create-reserve-1", "EUR:5", + 0, MHD_HTTP_OK), TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-2", "create-reserve-1", "EUR:5", + 0, MHD_HTTP_OK), /* Failed download: no backup exists */ SYNC_TESTING_cmd_backup_nx ("backup-download-nx", diff --git a/src/testing/test_sync_api.conf b/src/testing/test_sync_api.conf index 54d2af7..7a4ba64 100644 --- a/src/testing/test_sync_api.conf +++ b/src/testing/test_sync_api.conf @@ -160,6 +160,7 @@ fee_deposit = EUR:0.00 fee_refresh = EUR:0.01 fee_refund = EUR:0.01 rsa_keysize = 1024 +cipher = RSA [coin_eur_ct_10] value = EUR:0.10 @@ -171,6 +172,7 @@ fee_deposit = EUR:0.01 fee_refresh = EUR:0.03 fee_refund = EUR:0.01 rsa_keysize = 1024 +cipher = RSA [coin_eur_1] value = EUR:1 @@ -182,6 +184,7 @@ fee_deposit = EUR:0.01 fee_refresh = EUR:0.03 fee_refund = EUR:0.01 rsa_keysize = 1024 +cipher = RSA [coin_eur_5] value = EUR:5 @@ -193,3 +196,4 @@ fee_deposit = EUR:0.01 fee_refresh = EUR:0.03 fee_refund = EUR:0.01 rsa_keysize = 1024 +cipher = RSA |