[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] branch master updated: -fix build issues with latest T
|
From: |
gnunet |
|
Subject: |
[taler-anastasis] branch master updated: -fix build issues with latest Taler APIs |
|
Date: |
Sat, 24 Jul 2021 09:59:40 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository anastasis.
The following commit(s) were added to refs/heads/master by this push:
new 0186e68 -fix build issues with latest Taler APIs
0186e68 is described below
commit 0186e683558f3acc9af391ec05a7c00f550bb3c2
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Sat Jul 24 09:56:58 2021 +0200
-fix build issues with latest Taler APIs
---
src/backend/anastasis-httpd_policy_upload.c | 1 +
src/backend/anastasis-httpd_truth_upload.c | 1 +
src/reducer/anastasis_api_backup_redux.c | 36 ++++++++++++++---------------
src/reducer/anastasis_api_recovery_redux.c | 8 +++----
src/restclient/anastasis_api_config.c | 16 ++++++-------
5 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/src/backend/anastasis-httpd_policy_upload.c
b/src/backend/anastasis-httpd_policy_upload.c
index f8b4142..b8bd5ed 100644
--- a/src/backend/anastasis-httpd_policy_upload.c
+++ b/src/backend/anastasis-httpd_policy_upload.c
@@ -428,6 +428,7 @@ check_payment_cb (void *cls,
struct TALER_Amount amount;
struct GNUNET_JSON_Specification cspec[] = {
TALER_JSON_spec_amount ("amount",
+ AH_currency,
&amount),
GNUNET_JSON_spec_end ()
};
diff --git a/src/backend/anastasis-httpd_truth_upload.c
b/src/backend/anastasis-httpd_truth_upload.c
index a76a76b..9767087 100644
--- a/src/backend/anastasis-httpd_truth_upload.c
+++ b/src/backend/anastasis-httpd_truth_upload.c
@@ -323,6 +323,7 @@ check_payment_cb (void *cls,
struct TALER_Amount amount;
struct GNUNET_JSON_Specification cspec[] = {
TALER_JSON_spec_amount ("amount",
+ AH_currency,
&amount),
GNUNET_JSON_spec_end ()
};
diff --git a/src/reducer/anastasis_api_backup_redux.c
b/src/reducer/anastasis_api_backup_redux.c
index 5ff1b15..bffbff9 100644
--- a/src/reducer/anastasis_api_backup_redux.c
+++ b/src/reducer/anastasis_api_backup_redux.c
@@ -675,8 +675,8 @@ equiv_provider (struct PolicyBuilder *pb,
struct GNUNET_JSON_Specification s1[] = {
GNUNET_JSON_spec_json ("methods",
&m1),
- TALER_JSON_spec_amount ("truth_upload_fee",
- &uc1),
+ TALER_JSON_spec_amount_any ("truth_upload_fee",
+ &uc1),
GNUNET_JSON_spec_end ()
};
@@ -694,8 +694,8 @@ equiv_provider (struct PolicyBuilder *pb,
struct GNUNET_JSON_Specification s2[] = {
GNUNET_JSON_spec_json ("methods",
&m2),
- TALER_JSON_spec_amount ("truth_upload_fee",
- &uc2),
+ TALER_JSON_spec_amount_any ("truth_upload_fee",
+ &uc2),
GNUNET_JSON_spec_end ()
};
@@ -730,8 +730,8 @@ equiv_provider (struct PolicyBuilder *pb,
struct GNUNET_JSON_Specification s1[] = {
GNUNET_JSON_spec_string ("type",
&type1),
- TALER_JSON_spec_amount ("usage_fee",
- &fee1),
+ TALER_JSON_spec_amount_any ("usage_fee",
+ &fee1),
GNUNET_JSON_spec_end ()
};
bool matched = false;
@@ -755,8 +755,8 @@ equiv_provider (struct PolicyBuilder *pb,
struct GNUNET_JSON_Specification s2[] = {
GNUNET_JSON_spec_string ("type",
&type2),
- TALER_JSON_spec_amount ("usage_fee",
- &fee2),
+ TALER_JSON_spec_amount_any ("usage_fee",
+ &fee2),
GNUNET_JSON_spec_end ()
};
@@ -821,8 +821,8 @@ eval_provider_selection (struct PolicyBuilder *pb,
&size_limit_in_mb),
GNUNET_JSON_spec_json ("methods",
&provider_methods),
- TALER_JSON_spec_amount ("truth_upload_fee",
- &upload_cost),
+ TALER_JSON_spec_amount_any ("truth_upload_fee",
+ &upload_cost),
GNUNET_JSON_spec_end ()
};
void *challenge;
@@ -866,8 +866,8 @@ eval_provider_selection (struct PolicyBuilder *pb,
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_string ("type",
&type),
- TALER_JSON_spec_amount ("usage_fee",
- &method_cost),
+ TALER_JSON_spec_amount_any ("usage_fee",
+ &method_cost),
GNUNET_JSON_spec_end ()
};
@@ -1911,8 +1911,8 @@ add_policy (json_t *state,
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_string ("type",
&type),
- TALER_JSON_spec_amount ("usage_fee",
- &method_cost),
+ TALER_JSON_spec_amount_any ("usage_fee",
+ &method_cost),
GNUNET_JSON_spec_end ()
};
@@ -2293,8 +2293,8 @@ update_expiration_cost (json_t *state,
{
struct TALER_Amount annual_fee;
struct GNUNET_JSON_Specification pspec[] = {
- TALER_JSON_spec_amount ("annual_fee",
- &annual_fee),
+ TALER_JSON_spec_amount_any ("annual_fee",
+ &annual_fee),
GNUNET_JSON_spec_end ()
};
struct TALER_Amount fee;
@@ -2388,8 +2388,8 @@ update_expiration_cost (json_t *state,
{
struct TALER_Amount upload_cost;
struct GNUNET_JSON_Specification pspec[] = {
- TALER_JSON_spec_amount ("truth_upload_fee",
- &upload_cost),
+ TALER_JSON_spec_amount_any ("truth_upload_fee",
+ &upload_cost),
GNUNET_JSON_spec_end ()
};
struct TALER_Amount fee;
diff --git a/src/reducer/anastasis_api_recovery_redux.c
b/src/reducer/anastasis_api_recovery_redux.c
index 7373e5d..8a900ec 100644
--- a/src/reducer/anastasis_api_recovery_redux.c
+++ b/src/reducer/anastasis_api_recovery_redux.c
@@ -2062,8 +2062,8 @@ lookup_cost (const json_t *state,
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_string ("type",
&t),
- TALER_JSON_spec_amount ("usage_fee",
- cost),
+ TALER_JSON_spec_amount_any ("usage_fee",
+ cost),
GNUNET_JSON_spec_end ()
};
@@ -2226,8 +2226,8 @@ policy_lookup_cb (void *cls,
GNUNET_JSON_from_data_auto (&cd->uuid),
"cost",
(GNUNET_NO == ret)
- ? NULL
- : TALER_JSON_from_amount (&cost),
+ ? NULL
+ : TALER_JSON_from_amount (&cost),
"type",
cd->type,
"instructions",
diff --git a/src/restclient/anastasis_api_config.c
b/src/restclient/anastasis_api_config.c
index 8e81a5a..cf0846b 100644
--- a/src/restclient/anastasis_api_config.c
+++ b/src/restclient/anastasis_api_config.c
@@ -114,12 +114,12 @@ handle_config_finished (void *cls,
&methods),
GNUNET_JSON_spec_uint32 ("storage_limit_in_megabytes",
&acfg.storage_limit_in_megabytes),
- TALER_JSON_spec_amount ("annual_fee",
- &acfg.annual_fee),
- TALER_JSON_spec_amount ("truth_upload_fee",
- &acfg.truth_upload_fee),
- TALER_JSON_spec_amount ("liability_limit",
- &acfg.liability_limit),
+ TALER_JSON_spec_amount_any ("annual_fee",
+ &acfg.annual_fee),
+ TALER_JSON_spec_amount_any ("truth_upload_fee",
+ &acfg.truth_upload_fee),
+ TALER_JSON_spec_amount_any ("liability_limit",
+ &acfg.liability_limit),
GNUNET_JSON_spec_fixed_auto ("server_salt",
&acfg.salt),
GNUNET_JSON_spec_end ()
@@ -210,8 +210,8 @@ handle_config_finished (void *cls,
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_string ("type",
&m->type),
- TALER_JSON_spec_amount ("cost",
- &m->usage_fee),
+ TALER_JSON_spec_amount_any ("cost",
+ &m->usage_fee),
GNUNET_JSON_spec_end ()
};
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-anastasis] branch master updated: -fix build issues with latest Taler APIs,
gnunet <=