[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-sync] branch master updated: adapt to latest exchange
|
From: |
gnunet |
|
Subject: |
[taler-sync] branch master updated: adapt to latest exchange |
|
Date: |
Thu, 10 Mar 2022 02:35:28 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository sync.
The following commit(s) were added to refs/heads/master by this push:
new e03d725 adapt to latest exchange
e03d725 is described below
commit e03d7255f55b517f174b1f0157a5d9e6c55f23ff
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Thu Mar 10 02:35:22 2022 +0100
adapt to latest exchange
---
src/lib/sync_api_upload.c | 72 +++++++++++++++++++++---------------------
src/testing/test_sync_api.c | 3 ++
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
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-sync] branch master updated: adapt to latest exchange,
gnunet <=