[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-donau] branch master updated: [build] batch change includes relat
|
From: |
gnunet |
|
Subject: |
[taler-donau] branch master updated: [build] batch change includes related to taler with rule "includefile.h" -> "taler/includefile.h" |
|
Date: |
Mon, 27 Nov 2023 23:30:22 +0100 |
This is an automated email from the git hooks/post-receive script.
pius-loosli pushed a commit to branch master
in repository donau.
The following commit(s) were added to refs/heads/master by this push:
new 64d8493 [build] batch change includes related to taler with rule
"includefile.h" -> "taler/includefile.h"
64d8493 is described below
commit 64d849372709d4075ede8886ad73e7854792e15a
Author: Pius Loosli <loosp2@bfh.ch>
AuthorDate: Mon Nov 27 23:28:57 2023 +0100
[build] batch change includes related to taler with rule "includefile.h" ->
"taler/includefile.h"
---
src/donau-tools/taler-donau-dbinit.c | 2 +-
src/donau-tools/taler-donau-offline.c | 388 ++++++++++-----------
src/donau/donau-httpd_batch-issue_receipts.c | 6 +-
src/donau/donau-httpd_batch-submit_receipts.c | 10 +-
src/donau/donau-httpd_charities_close.c | 6 +-
src/donau/donau-httpd_charities_get.c | 6 +-
src/donau/donau-httpd_charities_history.c | 6 +-
src/donau/donau-httpd_charities_open.c | 6 +-
src/donau/donau-httpd_charities_status.c | 6 +-
src/donau/donau-httpd_common_submit_receipts.c | 2 +-
src/donau/donau-httpd_common_submit_receipts.h | 4 +-
src/donau/donau-httpd_config.c | 6 +-
src/donau/donau-httpd_csr.c | 10 +-
src/donau/donau-httpd_db.c | 6 +-
src/donau/donau-httpd_db.h | 4 +-
src/donau/donau-httpd_issue_receipts.c | 6 +-
src/donau/donau-httpd_keys.c | 16 +-
src/donau/donau-httpd_keys.h | 16 +-
src/donau/donau-httpd_metrics.c | 6 +-
src/donau/donau-httpd_mhd.c | 4 +-
src/donau/donau-httpd_responses.c | 10 +-
src/donau/donau-httpd_responses.h | 6 +-
src/donau/donau-httpd_submit_receipts_get.c | 14 +-
src/donau/donau-httpd_terms.c | 4 +-
src/donau/donau-httpd_terms.h | 6 +-
src/donaudb/pg_activate_signing_key.c | 4 +-
src/donaudb/pg_activate_signing_key.h | 4 +-
src/donaudb/pg_add_donation_unit_key.c | 4 +-
src/donaudb/pg_add_donation_unit_key.h | 4 +-
src/donaudb/pg_commit.c | 4 +-
src/donaudb/pg_commit.h | 4 +-
src/donaudb/pg_create_tables.c | 4 +-
src/donaudb/pg_create_tables.h | 4 +-
src/donaudb/pg_drop_tables.c | 4 +-
src/donaudb/pg_drop_tables.h | 4 +-
src/donaudb/pg_event_listen.c | 4 +-
src/donaudb/pg_event_listen.h | 4 +-
src/donaudb/pg_event_listen_cancel.c | 4 +-
src/donaudb/pg_event_listen_cancel.h | 4 +-
src/donaudb/pg_event_notify.c | 4 +-
src/donaudb/pg_event_notify.h | 4 +-
src/donaudb/pg_get_donation_unit_info.c | 4 +-
src/donaudb/pg_get_donation_unit_info.h | 4 +-
src/donaudb/pg_insert_charity.c | 4 +-
src/donaudb/pg_insert_charity.h | 4 +-
src/donaudb/pg_insert_history_entry.c | 10 +-
src/donaudb/pg_insert_history_entry.h | 11 +-
src/donaudb/pg_insert_issued_receipt.c | 4 +-
src/donaudb/pg_insert_issued_receipt.h | 7 +-
src/donaudb/pg_insert_submitted_receipt.c | 16 +-
src/donaudb/pg_insert_submitted_receipt.h | 17 +-
src/donaudb/pg_lookup_donation_unit_key.c | 4 +-
src/donaudb/pg_lookup_donation_unit_key.h | 4 +-
src/donaudb/pg_lookup_signing_key.c | 4 +-
src/donaudb/pg_lookup_signing_key.h | 4 +-
src/donaudb/pg_preflight.c | 4 +-
src/donaudb/pg_preflight.h | 4 +-
src/donaudb/pg_rollback.c | 4 +-
src/donaudb/pg_rollback.h | 4 +-
src/donaudb/pg_start.c | 4 +-
src/donaudb/pg_start.h | 4 +-
src/donaudb/pg_start_read_committed.c | 4 +-
src/donaudb/pg_start_read_committed.h | 4 +-
src/donaudb/pg_start_read_only.c | 4 +-
src/donaudb/pg_start_read_only.h | 4 +-
src/donaudb/pg_template.c | 4 +-
src/donaudb/pg_template.h | 4 +-
src/donaudb/test_donaudb.c | 14 +-
src/include/donau_service.h | 2 +-
src/json/test_json.c | 4 +-
src/lib/donau_api_batch_issue_receipts.c | 4 +-
src/lib/donau_api_batch_issue_receipts2.c | 10 +-
src/lib/donau_api_batch_submit_receipts.c | 34 +-
src/lib/donau_api_charities_close.c | 4 +-
src/lib/donau_api_charities_get.c | 4 +-
src/lib/donau_api_charities_history.c | 24 +-
src/lib/donau_api_charities_open.c | 16 +-
src/lib/donau_api_charities_status.c | 22 +-
src/lib/donau_api_common.c | 26 +-
src/lib/donau_api_common.h | 2 +-
src/lib/donau_api_csr_issue_receipts.c | 6 +-
src/lib/donau_api_handle.c | 16 +-
src/lib/donau_api_issue_receipts.c | 28 +-
src/lib/donau_api_issue_receipts2.c | 24 +-
src/lib/donau_api_submit_receipts_get.c | 14 +-
src/lib/donau_api_transfers_get.c | 4 +-
src/pq/pq_result_helper.c | 2 +-
src/pq/test_pq.c | 2 +-
src/testing/test_donau_api.c | 42 +--
src/testing/testing_api_cmd_batch.c | 4 +-
src/testing/testing_api_cmd_batch_deposit.c | 16 +-
src/testing/testing_api_cmd_batch_withdraw.c | 8 +-
src/testing/testing_api_cmd_common.c | 2 +-
src/testing/testing_api_cmd_deposit.c | 12 +-
src/testing/testing_api_cmd_deposits_get.c | 8 +-
src/testing/testing_api_cmd_get_donau.c | 26 +-
src/testing/testing_api_cmd_insert_deposit.c | 6 +-
.../testing_api_cmd_offline_sign_extensions.c | 4 +-
.../testing_api_cmd_offline_sign_global_fees.c | 4 +-
src/testing/testing_api_cmd_offline_sign_keys.c | 4 +-
src/testing/testing_api_cmd_reserve_close.c | 4 +-
src/testing/testing_api_cmd_reserve_get.c | 4 +-
src/testing/testing_api_cmd_reserve_history.c | 6 +-
src/testing/testing_api_cmd_reserve_open.c | 4 +-
src/testing/testing_api_cmd_reserve_status.c | 4 +-
src/testing/testing_api_cmd_revoke.c | 4 +-
src/testing/testing_api_cmd_revoke_denom_key.c | 14 +-
src/testing/testing_api_cmd_revoke_sign_key.c | 18 +-
src/testing/testing_api_cmd_stat.c | 4 +-
src/testing/testing_api_cmd_transfer_get.c | 4 +-
src/testing/testing_api_cmd_wait.c | 4 +-
src/testing/testing_api_cmd_withdraw.c | 8 +-
src/testing/testing_api_misc.c | 2 +-
113 files changed, 625 insertions(+), 618 deletions(-)
diff --git a/src/donau-tools/taler-donau-dbinit.c
b/src/donau-tools/taler-donau-dbinit.c
index a0f86d6..e3f8e8e 100644
--- a/src/donau-tools/taler-donau-dbinit.c
+++ b/src/donau-tools/taler-donau-dbinit.c
@@ -19,7 +19,7 @@
* @author Florian Dold
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
#include "taler_donaudb_lib.h"
diff --git a/src/donau-tools/taler-donau-offline.c
b/src/donau-tools/taler-donau-offline.c
index 63e0497..827b9ec 100644
--- a/src/donau-tools/taler-donau-offline.c
+++ b/src/donau-tools/taler-donau-offline.c
@@ -21,9 +21,9 @@
#include <platform.h>
#include <gnunet/gnunet_json_lib.h>
#include <gnunet/gnunet_util_lib.h>
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "taler_donau_service.h"
-#include "taler_extensions.h"
+#include "taler/taler_extensions.h"
#include <regex.h>
@@ -1196,11 +1196,11 @@ upload_denom_revocation (const char *donau_url,
drr->idx = idx;
drr->h =
DONAU_management_revoke_denomination_key (ctx,
- donau_url,
- &h_denom_pub,
- &master_sig,
- &denom_revocation_cb,
- drr);
+ donau_url,
+ &h_denom_pub,
+ &master_sig,
+ &denom_revocation_cb,
+ drr);
GNUNET_CONTAINER_DLL_insert (drr_head,
drr_tail,
drr);
@@ -1286,11 +1286,11 @@ upload_signkey_revocation (const char *donau_url,
srr->idx = idx;
srr->h =
DONAU_management_revoke_signing_key (ctx,
- donau_url,
- &donau_pub,
- &master_sig,
- &signkey_revocation_cb,
- srr);
+ donau_url,
+ &donau_pub,
+ &master_sig,
+ &signkey_revocation_cb,
+ srr);
GNUNET_CONTAINER_DLL_insert (srr_head,
srr_tail,
srr);
@@ -1385,14 +1385,14 @@ upload_auditor_add (const char *donau_url,
aar->idx = idx;
aar->h =
DONAU_management_enable_auditor (ctx,
- donau_url,
- &auditor_pub,
- auditor_url,
- auditor_name,
- start_time,
- &master_sig,
- &auditor_add_cb,
- aar);
+ donau_url,
+ &auditor_pub,
+ auditor_url,
+ auditor_name,
+ start_time,
+ &master_sig,
+ &auditor_add_cb,
+ aar);
GNUNET_CONTAINER_DLL_insert (aar_head,
aar_tail,
aar);
@@ -1481,12 +1481,12 @@ upload_auditor_del (const char *donau_url,
adr->idx = idx;
adr->h =
DONAU_management_disable_auditor (ctx,
- donau_url,
- &auditor_pub,
- end_time,
- &master_sig,
- &auditor_del_cb,
- adr);
+ donau_url,
+ &auditor_pub,
+ end_time,
+ &master_sig,
+ &auditor_del_cb,
+ adr);
GNUNET_CONTAINER_DLL_insert (adr_head,
adr_tail,
adr);
@@ -1617,16 +1617,16 @@ upload_wire_add (const char *donau_url,
war->idx = idx;
war->h =
DONAU_management_enable_wire (ctx,
- donau_url,
- payto_uri,
- conversion_url,
- debit_restrictions,
- credit_restrictions,
- start_time,
- &master_sig_add,
- &master_sig_wire,
- &wire_add_cb,
- war);
+ donau_url,
+ payto_uri,
+ conversion_url,
+ debit_restrictions,
+ credit_restrictions,
+ start_time,
+ &master_sig_add,
+ &master_sig_wire,
+ &wire_add_cb,
+ war);
GNUNET_CONTAINER_DLL_insert (war_head,
war_tail,
war);
@@ -1714,12 +1714,12 @@ upload_wire_del (const char *donau_url,
wdr->idx = idx;
wdr->h =
DONAU_management_disable_wire (ctx,
- donau_url,
- payto_uri,
- end_time,
- &master_sig,
- &wire_del_cb,
- wdr);
+ donau_url,
+ payto_uri,
+ end_time,
+ &master_sig,
+ &wire_del_cb,
+ wdr);
GNUNET_CONTAINER_DLL_insert (wdr_head,
wdr_tail,
wdr);
@@ -1818,14 +1818,14 @@ upload_wire_fee (const char *donau_url,
wfr->idx = idx;
wfr->h =
DONAU_management_set_wire_fees (ctx,
- donau_url,
- wire_method,
- start_time,
- end_time,
- &fees,
- &master_sig,
- &wire_fee_cb,
- wfr);
+ donau_url,
+ wire_method,
+ start_time,
+ end_time,
+ &fees,
+ &master_sig,
+ &wire_fee_cb,
+ wfr);
GNUNET_CONTAINER_DLL_insert (wfr_head,
wfr_tail,
wfr);
@@ -1933,16 +1933,16 @@ upload_global_fee (const char *donau_url,
gfr->idx = idx;
gfr->h =
DONAU_management_set_global_fees (ctx,
- donau_url,
- start_time,
- end_time,
- &fees,
- purse_timeout,
- history_expiration,
- purse_account_limit,
- &master_sig,
- &global_fee_cb,
- gfr);
+ donau_url,
+ start_time,
+ end_time,
+ &fees,
+ purse_timeout,
+ history_expiration,
+ purse_account_limit,
+ &master_sig,
+ &global_fee_cb,
+ gfr);
GNUNET_CONTAINER_DLL_insert (gfr_head,
gfr_tail,
gfr);
@@ -2041,15 +2041,15 @@ upload_drain (const char *donau_url,
dpr->idx = idx;
dpr->h =
DONAU_management_drain_profits (ctx,
- donau_url,
- &wtid,
- &amount,
- date,
- account_section,
- payto_uri,
- &master_sig,
- &drain_profits_cb,
- dpr);
+ donau_url,
+ &wtid,
+ &amount,
+ date,
+ account_section,
+ payto_uri,
+ &master_sig,
+ &drain_profits_cb,
+ dpr);
GNUNET_CONTAINER_DLL_insert (dpr_head,
dpr_tail,
dpr);
@@ -2211,10 +2211,10 @@ upload_keys (const char *donau_url,
ukr->idx = idx;
ukr->h =
DONAU_post_management_keys (ctx,
- donau_url,
- &pkd,
- &keys_cb,
- ukr);
+ donau_url,
+ &pkd,
+ &keys_cb,
+ ukr);
GNUNET_CONTAINER_DLL_insert (ukr_head,
ukr_tail,
ukr);
@@ -2455,16 +2455,16 @@ add_partner (const char *donau_url,
par->idx = idx;
par->h =
DONAU_management_add_partner (ctx,
- donau_url,
- &partner_pub,
- start_date,
- end_date,
- wad_frequency,
- &wad_fee,
- partner_base_url,
- &master_sig,
- &add_partner_cb,
- par);
+ donau_url,
+ &partner_pub,
+ start_date,
+ end_date,
+ wad_frequency,
+ &wad_fee,
+ partner_base_url,
+ &master_sig,
+ &add_partner_cb,
+ par);
GNUNET_CONTAINER_DLL_insert (par_head,
par_tail,
par);
@@ -2562,15 +2562,15 @@ update_aml_staff (const char *donau_url,
asr->idx = idx;
asr->h =
DONAU_management_update_aml_officer (ctx,
- donau_url,
- &officer_pub,
- officer_name,
- change_date,
- is_active,
- read_only,
- &master_sig,
- &update_aml_officer_cb,
- asr);
+ donau_url,
+ &officer_pub,
+ officer_name,
+ change_date,
+ is_active,
+ read_only,
+ &master_sig,
+ &update_aml_officer_cb,
+ asr);
GNUNET_CONTAINER_DLL_insert (asr_head,
asr_tail,
asr);
@@ -2790,8 +2790,8 @@ do_revoke_denomination_key (char *const *args)
load_offline_key (GNUNET_NO))
return;
TALER_donau_offline_denomination_revoke_sign (&h_denom_pub,
- &master_priv,
- &master_sig);
+ &master_priv,
+ &master_sig);
output_operation (OP_REVOKE_DENOMINATION,
GNUNET_JSON_PACK (
GNUNET_JSON_pack_data_auto ("h_denom_pub",
@@ -2839,8 +2839,8 @@ do_revoke_signkey (char *const *args)
load_offline_key (GNUNET_NO))
return;
TALER_donau_offline_signkey_revoke_sign (&donau_pub,
- &master_priv,
- &master_sig);
+ &master_priv,
+ &master_sig);
output_operation (OP_REVOKE_SIGNKEY,
GNUNET_JSON_PACK (
GNUNET_JSON_pack_data_auto ("donau_pub",
@@ -2904,10 +2904,10 @@ do_add_auditor (char *const *args)
return;
now = GNUNET_TIME_timestamp_get ();
TALER_donau_offline_auditor_add_sign (&auditor_pub,
- args[1],
- now,
- &master_priv,
- &master_sig);
+ args[1],
+ now,
+ &master_priv,
+ &master_sig);
output_operation (OP_ENABLE_AUDITOR,
GNUNET_JSON_PACK (
GNUNET_JSON_pack_string ("auditor_url",
@@ -2963,9 +2963,9 @@ do_del_auditor (char *const *args)
return;
now = GNUNET_TIME_timestamp_get ();
TALER_donau_offline_auditor_del_sign (&auditor_pub,
- now,
- &master_priv,
- &master_sig);
+ now,
+ &master_priv,
+ &master_sig);
output_operation (OP_DISABLE_AUDITOR,
GNUNET_JSON_PACK (
GNUNET_JSON_pack_data_auto ("auditor_pub",
@@ -3199,18 +3199,18 @@ do_add_wire (char *const *args)
break;
}
TALER_donau_offline_wire_add_sign (args[0],
- conversion_url,
- debit_restrictions,
- credit_restrictions,
- now,
- &master_priv,
- &master_sig_add);
+ conversion_url,
+ debit_restrictions,
+ credit_restrictions,
+ now,
+ &master_priv,
+ &master_sig_add);
TALER_donau_wire_signature_make (args[0],
- conversion_url,
- debit_restrictions,
- credit_restrictions,
- &master_priv,
- &master_sig_wire);
+ conversion_url,
+ debit_restrictions,
+ credit_restrictions,
+ &master_priv,
+ &master_sig_wire);
output_operation (OP_ENABLE_WIRE,
GNUNET_JSON_PACK (
GNUNET_JSON_pack_string ("payto_uri",
@@ -3265,9 +3265,9 @@ do_del_wire (char *const *args)
return;
now = GNUNET_TIME_timestamp_get ();
TALER_donau_offline_wire_del_sign (args[0],
- now,
- &master_priv,
- &master_sig);
+ now,
+ &master_priv,
+ &master_sig);
output_operation (OP_DISABLE_WIRE,
GNUNET_JSON_PACK (
GNUNET_JSON_pack_string ("payto_uri",
@@ -3340,11 +3340,11 @@ do_set_wire_fee (char *const *args)
GNUNET_TIME_year_to_time (year + 1));
TALER_donau_offline_wire_fee_sign (args[1],
- start_time,
- end_time,
- &fees,
- &master_priv,
- &master_sig);
+ start_time,
+ end_time,
+ &fees,
+ &master_priv,
+ &master_sig);
output_operation (OP_SET_WIRE_FEE,
GNUNET_JSON_PACK (
GNUNET_JSON_pack_string ("wire_method",
@@ -3471,13 +3471,13 @@ do_set_global_fee (char *const *args)
GNUNET_TIME_year_to_time (year + 1));
TALER_donau_offline_global_fee_sign (start_time,
- end_time,
- &fees,
- purse_timeout,
- history_expiration,
- (uint32_t) purse_account_limit,
- &master_priv,
- &master_sig);
+ end_time,
+ &fees,
+ purse_timeout,
+ history_expiration,
+ (uint32_t) purse_account_limit,
+ &master_priv,
+ &master_sig);
output_operation (OP_SET_GLOBAL_FEE,
GNUNET_JSON_PACK (
GNUNET_JSON_pack_timestamp ("start_time",
@@ -3586,12 +3586,12 @@ do_drain (char *const *args)
sizeof (wtid));
date = GNUNET_TIME_timestamp_get ();
TALER_donau_offline_profit_drain_sign (&wtid,
- date,
- &amount,
- account_section,
- payto_uri,
- &master_priv,
- &master_sig);
+ date,
+ &amount,
+ account_section,
+ payto_uri,
+ &master_priv,
+ &master_sig);
output_operation (OP_DRAIN_PROFITS,
GNUNET_JSON_PACK (
GNUNET_JSON_pack_data_auto ("wtid",
@@ -3715,13 +3715,13 @@ do_add_partner (char *const *args)
load_offline_key (GNUNET_NO))
return;
TALER_donau_offline_partner_details_sign (&partner_pub,
- start_date,
- end_date,
- wad_frequency,
- &wad_fee,
- partner_base_url,
- &master_priv,
- &master_sig);
+ start_date,
+ end_date,
+ wad_frequency,
+ &wad_fee,
+ partner_base_url,
+ &master_priv,
+ &master_sig);
output_operation (OP_ADD_PARTNER,
GNUNET_JSON_PACK (
GNUNET_JSON_pack_string ("partner_base_url",
@@ -3813,12 +3813,12 @@ do_set_aml_staff (bool is_active,
load_offline_key (GNUNET_NO))
return;
TALER_donau_offline_aml_officer_status_sign (&officer_pub,
- officer_name,
- now,
- is_active,
- read_only,
- &master_priv,
- &master_sig);
+ officer_name,
+ now,
+ is_active,
+ read_only,
+ &master_priv,
+ &master_sig);
output_operation (OP_UPDATE_AML_STAFF,
GNUNET_JSON_PACK (
GNUNET_JSON_pack_string ("officer_name",
@@ -3941,9 +3941,9 @@ do_download (char *const *args)
return;
}
mgkh = DONAU_get_management_keys (ctx,
- CFG_donau_url,
- &download_cb,
- (void *) args);
+ CFG_donau_url,
+ &download_cb,
+ (void *) args);
}
@@ -4196,10 +4196,10 @@ show_signkeys (const struct
TALER_SecurityModulePublicKeyP *secm_pub,
sign_end.abs_time);
if (GNUNET_OK !=
TALER_donau_secmod_eddsa_verify (&donau_pub,
- start_time,
- duration,
- secm_pub,
- &secm_sig))
+ start_time,
+ duration,
+ secm_pub,
+ &secm_sig))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Invalid security module signature for signing key %s
(aborting)\n",
@@ -4314,11 +4314,11 @@ show_denomkeys (const struct
TALER_SecurityModulePublicKeyP *secm_pub_rsa,
TALER_rsa_pub_hash (denom_pub.details.rsa_public_key,
&h_rsa);
ok = TALER_donau_secmod_rsa_verify (&h_rsa,
- section_name,
- stamp_start,
- duration,
- secm_pub_rsa,
- &secm_sig);
+ section_name,
+ stamp_start,
+ duration,
+ secm_pub_rsa,
+ &secm_sig);
}
break;
case TALER_DENOMINATION_CS:
@@ -4328,11 +4328,11 @@ show_denomkeys (const struct
TALER_SecurityModulePublicKeyP *secm_pub_rsa,
TALER_cs_pub_hash (&denom_pub.details.cs_public_key,
&h_cs);
ok = TALER_donau_secmod_cs_verify (&h_cs,
- section_name,
- stamp_start,
- duration,
- secm_pub_cs,
- &secm_sig);
+ section_name,
+ stamp_start,
+ duration,
+ secm_pub_cs,
+ &secm_sig);
}
break;
default:
@@ -4627,10 +4627,10 @@ sign_signkeys (const struct
TALER_SecurityModulePublicKeyP *secm_pub,
sign_end.abs_time);
if (GNUNET_OK !=
TALER_donau_secmod_eddsa_verify (&donau_pub,
- start_time,
- duration,
- secm_pub,
- &secm_sig))
+ start_time,
+ duration,
+ secm_pub,
+ &secm_sig))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Invalid security module signature for signing key %s
(aborting)\n",
@@ -4644,11 +4644,11 @@ sign_signkeys (const struct
TALER_SecurityModulePublicKeyP *secm_pub,
struct TALER_MasterSignatureP master_sig;
TALER_donau_offline_signkey_validity_sign (&donau_pub,
- start_time,
- sign_end,
- legal_end,
- &master_priv,
- &master_sig);
+ start_time,
+ sign_end,
+ legal_end,
+ &master_priv,
+ &master_sig);
GNUNET_assert (0 ==
json_array_append_new (
result,
@@ -4795,11 +4795,11 @@ sign_denomkeys (const struct
TALER_SecurityModulePublicKeyP *secm_pub_rsa,
&h_rsa);
if (GNUNET_OK !=
TALER_donau_secmod_rsa_verify (&h_rsa,
- section_name,
- stamp_start,
- duration,
- secm_pub_rsa,
- &secm_sig))
+ section_name,
+ stamp_start,
+ duration,
+ secm_pub_rsa,
+ &secm_sig))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Invalid security module signature for denomination key
%s (aborting)\n",
@@ -4819,11 +4819,11 @@ sign_denomkeys (const struct
TALER_SecurityModulePublicKeyP *secm_pub_rsa,
&h_cs);
if (GNUNET_OK !=
TALER_donau_secmod_cs_verify (&h_cs,
- section_name,
- stamp_start,
- duration,
- secm_pub_cs,
- &secm_sig))
+ section_name,
+ stamp_start,
+ duration,
+ secm_pub_cs,
+ &secm_sig))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Invalid security module signature for denomination key
%s (aborting)\n",
@@ -4846,14 +4846,14 @@ sign_denomkeys (const struct
TALER_SecurityModulePublicKeyP *secm_pub_rsa,
struct TALER_MasterSignatureP master_sig;
TALER_donau_offline_denom_validity_sign (&h_denom_pub,
- stamp_start,
- stamp_expire_withdraw,
- stamp_expire_deposit,
- stamp_expire_legal,
- &coin_value,
- &fees,
- &master_priv,
- &master_sig);
+ stamp_start,
+ stamp_expire_withdraw,
+ stamp_expire_deposit,
+ stamp_expire_legal,
+ &coin_value,
+ &fees,
+ &master_priv,
+ &master_sig);
GNUNET_assert (0 ==
json_array_append_new (
result,
@@ -5113,8 +5113,8 @@ do_extensions_sign (char *const *args)
}
TALER_donau_offline_extension_manifests_hash_sign (&h_manifests,
- &master_priv,
- &sig);
+ &master_priv,
+ &sig);
obj = GNUNET_JSON_PACK (
GNUNET_JSON_pack_object_steal ("extensions",
extensions),
diff --git a/src/donau/donau-httpd_batch-issue_receipts.c
b/src/donau/donau-httpd_batch-issue_receipts.c
index 8277d5c..b7f2987 100644
--- a/src/donau/donau-httpd_batch-issue_receipts.c
+++ b/src/donau/donau-httpd_batch-issue_receipts.c
@@ -23,13 +23,13 @@
* @author Benedikt Mueller
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
#include <jansson.h>
#include "taler-donau-httpd.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "taler_kyclogic_lib.h"
-#include "taler_mhd_lib.h"
+#include "taler/taler_mhd_lib.h"
#include "taler-donau-httpd_batch-withdraw.h"
#include "taler-donau-httpd_responses.h"
#include "taler-donau-httpd_keys.h"
diff --git a/src/donau/donau-httpd_batch-submit_receipts.c
b/src/donau/donau-httpd_batch-submit_receipts.c
index 8098fd5..1ee1e54 100644
--- a/src/donau/donau-httpd_batch-submit_receipts.c
+++ b/src/donau/donau-httpd_batch-submit_receipts.c
@@ -22,14 +22,14 @@
* @author Benedikt Mueller
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <jansson.h>
#include <microhttpd.h>
#include <pthread.h>
-#include "taler_json_lib.h"
-#include "taler_mhd_lib.h"
+#include "taler/taler_json_lib.h"
+#include "taler/taler_mhd_lib.h"
#include "taler-donau-httpd_batch-deposit.h"
#include "taler-donau-httpd_responses.h"
#include "taler_donaudb_lib.h"
@@ -592,8 +592,8 @@ TEH_handler_batch_deposit (struct TEH_RequestContext *rc,
TALER_payto_hash (bd->receiver_wire_account,
&bd->wire_target_h_payto);
TALER_charity_wire_signature_hash (bd->receiver_wire_account,
- &bd->wire_salt,
- &dc.h_wire);
+ &bd->wire_salt,
+ &dc.h_wire);
/* handle policy, if present */
if (NULL != dc.policy_json)
diff --git a/src/donau/donau-httpd_charities_close.c
b/src/donau/donau-httpd_charities_close.c
index 1cebc14..8c78298 100644
--- a/src/donau/donau-httpd_charities_close.c
+++ b/src/donau/donau-httpd_charities_close.c
@@ -20,12 +20,12 @@
* @author Benedikt Mueller
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
#include <jansson.h>
#include "taler_kyclogic_lib.h"
-#include "taler_mhd_lib.h"
-#include "taler_json_lib.h"
+#include "taler/taler_mhd_lib.h"
+#include "taler/taler_json_lib.h"
#include "taler_dbevents.h"
#include "taler-donau-httpd_keys.h"
#include "taler-donau-httpd_reserves_close.h"
diff --git a/src/donau/donau-httpd_charities_get.c
b/src/donau/donau-httpd_charities_get.c
index 835c2a8..bcb15be 100644
--- a/src/donau/donau-httpd_charities_get.c
+++ b/src/donau/donau-httpd_charities_get.c
@@ -20,11 +20,11 @@
* @author Benedikt Mueller
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
#include <jansson.h>
-#include "taler_mhd_lib.h"
-#include "taler_json_lib.h"
+#include "taler/taler_mhd_lib.h"
+#include "taler/taler_json_lib.h"
#include "taler_dbevents.h"
#include "taler-donau-httpd_keys.h"
#include "taler-donau-httpd_reserves_get.h"
diff --git a/src/donau/donau-httpd_charities_history.c
b/src/donau/donau-httpd_charities_history.c
index 5fc158f..64d4f4b 100644
--- a/src/donau/donau-httpd_charities_history.c
+++ b/src/donau/donau-httpd_charities_history.c
@@ -20,11 +20,11 @@
* @author Benedikt Mueller
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
#include <jansson.h>
-#include "taler_mhd_lib.h"
-#include "taler_json_lib.h"
+#include "taler/taler_mhd_lib.h"
+#include "taler/taler_json_lib.h"
#include "taler_dbevents.h"
#include "taler-donau-httpd_keys.h"
#include "taler-donau-httpd_reserves_history.h"
diff --git a/src/donau/donau-httpd_charities_open.c
b/src/donau/donau-httpd_charities_open.c
index 070edba..c4e7d02 100644
--- a/src/donau/donau-httpd_charities_open.c
+++ b/src/donau/donau-httpd_charities_open.c
@@ -18,11 +18,11 @@
* @brief Handle /reserves/$RESERVE_PUB/open requests
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
#include <jansson.h>
-#include "taler_mhd_lib.h"
-#include "taler_json_lib.h"
+#include "taler/taler_mhd_lib.h"
+#include "taler/taler_json_lib.h"
#include "taler_dbevents.h"
#include "taler-donau-httpd_common_deposit.h"
#include "taler-donau-httpd_keys.h"
diff --git a/src/donau/donau-httpd_charities_status.c
b/src/donau/donau-httpd_charities_status.c
index f52ffde..650cac7 100644
--- a/src/donau/donau-httpd_charities_status.c
+++ b/src/donau/donau-httpd_charities_status.c
@@ -20,11 +20,11 @@
* @author Benedikt Mueller
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
#include <jansson.h>
-#include "taler_mhd_lib.h"
-#include "taler_json_lib.h"
+#include "taler/taler_mhd_lib.h"
+#include "taler/taler_json_lib.h"
#include "taler_dbevents.h"
#include "taler-donau-httpd_keys.h"
#include "taler-donau-httpd_reserves_status.h"
diff --git a/src/donau/donau-httpd_common_submit_receipts.c
b/src/donau/donau-httpd_common_submit_receipts.c
index e8fed71..28f1284 100644
--- a/src/donau/donau-httpd_common_submit_receipts.c
+++ b/src/donau/donau-httpd_common_submit_receipts.c
@@ -18,7 +18,7 @@
* @brief shared logic for handling deposited coins
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include "taler-donau-httpd_common_deposit.h"
#include "taler-donau-httpd.h"
#include "taler-donau-httpd_keys.h"
diff --git a/src/donau/donau-httpd_common_submit_receipts.h
b/src/donau/donau-httpd_common_submit_receipts.h
index 20f4679..8573265 100644
--- a/src/donau/donau-httpd_common_submit_receipts.h
+++ b/src/donau/donau-httpd_common_submit_receipts.h
@@ -25,8 +25,8 @@
#include <gnunet/gnunet_json_lib.h>
#include <jansson.h>
#include <microhttpd.h>
-#include "taler_json_lib.h"
-#include "taler_mhd_lib.h"
+#include "taler/taler_json_lib.h"
+#include "taler/taler_mhd_lib.h"
/**
diff --git a/src/donau/donau-httpd_config.c b/src/donau/donau-httpd_config.c
index 9034d87..1b89768 100644
--- a/src/donau/donau-httpd_config.c
+++ b/src/donau/donau-httpd_config.c
@@ -18,13 +18,13 @@
* @brief Handle /config requests
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_json_lib.h>
#include "taler_dbevents.h"
#include "taler-donau-httpd_config.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "taler_kyclogic_lib.h"
-#include "taler_mhd_lib.h"
+#include "taler/taler_mhd_lib.h"
#include <jansson.h>
diff --git a/src/donau/donau-httpd_csr.c b/src/donau/donau-httpd_csr.c
index 346648f..915a972 100644
--- a/src/donau/donau-httpd_csr.c
+++ b/src/donau/donau-httpd_csr.c
@@ -22,11 +22,11 @@
* @author Lucien Heuzeveldt
* @author Gian Demarmles
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
#include <jansson.h>
-#include "taler_json_lib.h"
-#include "taler_mhd_lib.h"
+#include "taler/taler_json_lib.h"
+#include "taler/taler_mhd_lib.h"
#include "taler-donau-httpd_csr.h"
#include "taler-donau-httpd_responses.h"
#include "taler-donau-httpd_keys.h"
@@ -203,7 +203,7 @@ TEH_handler_csr_melt (struct TEH_RequestContext *rc,
csr_obj = GNUNET_JSON_PACK (
TALER_JSON_pack_donau_withdraw_values ("ewv",
- &ewvs[i]));
+ &ewvs[i]));
GNUNET_assert (NULL != csr_obj);
GNUNET_assert (0 ==
json_array_append_new (csr_response_ewvs,
@@ -333,7 +333,7 @@ TEH_handler_csr_withdraw (struct TEH_RequestContext *rc,
rc->connection,
MHD_HTTP_OK,
TALER_JSON_pack_donau_withdraw_values ("ewv",
- &ewv));
+ &ewv));
}
diff --git a/src/donau/donau-httpd_db.c b/src/donau/donau-httpd_db.c
index e14f8df..e488724 100644
--- a/src/donau/donau-httpd_db.c
+++ b/src/donau/donau-httpd_db.c
@@ -18,12 +18,12 @@
* @brief Generic database operations for the donau.
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <pthread.h>
#include <jansson.h>
#include <gnunet/gnunet_json_lib.h>
-#include "taler_json_lib.h"
-#include "taler_mhd_lib.h"
+#include "taler/taler_json_lib.h"
+#include "taler/taler_mhd_lib.h"
#include "taler_donaudb_lib.h"
#include "taler-donau-httpd_db.h"
#include "taler-donau-httpd_responses.h"
diff --git a/src/donau/donau-httpd_db.h b/src/donau/donau-httpd_db.h
index 207ec38..50977d5 100644
--- a/src/donau/donau-httpd_db.h
+++ b/src/donau/donau-httpd_db.h
@@ -22,8 +22,8 @@
#define DONAU_HTTPD_DB_H
#include <microhttpd.h>
-#include "taler_donaudb_plugin.h"
-#include "taler-donau-httpd_metrics.h"
+#include "donaudb_plugin.h"
+// #include "taler-donau-httpd_metrics.h"
#include <gnunet/gnunet_mhd_compat.h>
diff --git a/src/donau/donau-httpd_issue_receipts.c
b/src/donau/donau-httpd_issue_receipts.c
index 9569d21..ef10bfc 100644
--- a/src/donau/donau-httpd_issue_receipts.c
+++ b/src/donau/donau-httpd_issue_receipts.c
@@ -23,13 +23,13 @@
* @author Benedikt Mueller
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
#include <jansson.h>
#include "taler-donau-httpd.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "taler_kyclogic_lib.h"
-#include "taler_mhd_lib.h"
+#include "taler/taler_mhd_lib.h"
#include "taler-donau-httpd_withdraw.h"
#include "taler-donau-httpd_responses.h"
#include "taler-donau-httpd_keys.h"
diff --git a/src/donau/donau-httpd_keys.c b/src/donau/donau-httpd_keys.c
index c7876b2..8050278 100644
--- a/src/donau/donau-httpd_keys.c
+++ b/src/donau/donau-httpd_keys.c
@@ -19,17 +19,17 @@
* @author Christian Grothoff
* @author Özgür Kesim
*/
-#include "platform.h"
-#include "taler_json_lib.h"
-#include "taler_mhd_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
+#include "taler/taler_mhd_lib.h"
#include "taler_kyclogic_lib.h"
#include "taler_dbevents.h"
#include "taler-donau-httpd.h"
#include "taler-donau-httpd_config.h"
#include "taler-donau-httpd_keys.h"
#include "taler-donau-httpd_responses.h"
-#include "taler_donaudb_plugin.h"
-#include "taler_extensions.h"
+#include "donaudb_plugin.h"
+#include "taler/taler_extensions.h"
/**
@@ -3777,9 +3777,9 @@ TEH_keys_donau_sign_ (
return TALER_EC_DONAU_GENERIC_KEYS_MISSING;
}
return TEH_keys_donau_sign2_ (ksh,
- purpose,
- pub,
- sig);
+ purpose,
+ pub,
+ sig);
}
diff --git a/src/donau/donau-httpd_keys.h b/src/donau/donau-httpd_keys.h
index 34512b9..96943ae 100644
--- a/src/donau/donau-httpd_keys.h
+++ b/src/donau/donau-httpd_keys.h
@@ -18,9 +18,9 @@
* @brief management of our various keys
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_json_lib.h"
-#include "taler_mhd_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
+#include "taler/taler_mhd_lib.h"
#include "taler-donau-httpd_responses.h"
@@ -478,8 +478,8 @@ TEH_keys_donau_sign2_ (
GNUNET_static_assert (((void*) (ps)) == \
((void*) &(ps)->purpose)); \
TEH_keys_donau_sign_ (&(ps)->purpose, \
- pub, \
- sig); \
+ pub, \
+ sig); \
})
@@ -511,9 +511,9 @@ TEH_keys_donau_sign2_ (
GNUNET_static_assert (((void*) (ps)) == \
((void*) &(ps)->purpose)); \
TEH_keys_donau_sign2_ (ksh, \
- &(ps)->purpose, \
- pub, \
- sig); \
+ &(ps)->purpose, \
+ pub, \
+ sig); \
})
diff --git a/src/donau/donau-httpd_metrics.c b/src/donau/donau-httpd_metrics.c
index 608a02a..73fdbd4 100644
--- a/src/donau/donau-httpd_metrics.c
+++ b/src/donau/donau-httpd_metrics.c
@@ -18,14 +18,14 @@
* @brief Handle /metrics requests
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_json_lib.h>
#include "taler_dbevents.h"
#include "taler-donau-httpd_responses.h"
#include "taler-donau-httpd_keys.h"
#include "taler-donau-httpd_metrics.h"
-#include "taler_json_lib.h"
-#include "taler_mhd_lib.h"
+#include "taler/taler_json_lib.h"
+#include "taler/taler_mhd_lib.h"
#include <jansson.h>
diff --git a/src/donau/donau-httpd_mhd.c b/src/donau/donau-httpd_mhd.c
index 0ee0a94..4912ec7 100644
--- a/src/donau/donau-httpd_mhd.c
+++ b/src/donau/donau-httpd_mhd.c
@@ -23,12 +23,12 @@
* @author Benedikt Mueller
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
#include <jansson.h>
#include <microhttpd.h>
#include <pthread.h>
-#include "taler_mhd_lib.h"
+#include "taler/taler_mhd_lib.h"
#include "taler-donau-httpd_responses.h"
#include "taler-donau-httpd.h"
#include "taler-donau-httpd_mhd.h"
diff --git a/src/donau/donau-httpd_responses.c
b/src/donau/donau-httpd_responses.c
index ed28aab..d513843 100644
--- a/src/donau/donau-httpd_responses.c
+++ b/src/donau/donau-httpd_responses.c
@@ -22,13 +22,13 @@
* @author Benedikt Mueller
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <microhttpd.h>
#include <zlib.h>
#include "taler-donau-httpd_responses.h"
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_mhd_lib.h"
+#include "taler/taler_json_lib.h"
+#include "taler/taler_mhd_lib.h"
#include "taler-donau-httpd_keys.h"
@@ -65,8 +65,8 @@ TEH_RESPONSE_compile_transaction_history (
struct TALER_CharityWireHashP h_wire;
TALER_charity_wire_signature_hash (deposit->receiver_wire_account,
- &deposit->wire_salt,
- &h_wire);
+ &deposit->wire_salt,
+ &h_wire);
#if ENABLE_SANITY_CHECKS
/* internal sanity check before we hand out a bogus sig... */
TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
diff --git a/src/donau/donau-httpd_responses.h
b/src/donau/donau-httpd_responses.h
index fff7bce..86c3530 100644
--- a/src/donau/donau-httpd_responses.h
+++ b/src/donau/donau-httpd_responses.h
@@ -27,9 +27,9 @@
#include <gnunet/gnunet_util_lib.h>
#include <jansson.h>
#include <microhttpd.h>
-#include "taler_error_codes.h"
-#include "taler-donau-httpd.h"
-#include "taler-donau-httpd_db.h"
+#include "taler/taler_error_codes.h"
+#include "donau-httpd.h"
+#include "donau-httpd_db.h"
#include <gnunet/gnunet_mhd_compat.h>
diff --git a/src/donau/donau-httpd_submit_receipts_get.c
b/src/donau/donau-httpd_submit_receipts_get.c
index 8b7fe7c..442b3f1 100644
--- a/src/donau/donau-httpd_submit_receipts_get.c
+++ b/src/donau/donau-httpd_submit_receipts_get.c
@@ -18,14 +18,14 @@
* @brief Handle wire deposit tracking-related requests
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
#include <jansson.h>
#include <microhttpd.h>
#include <pthread.h>
#include "taler_dbevents.h"
-#include "taler_json_lib.h"
-#include "taler_mhd_lib.h"
+#include "taler/taler_json_lib.h"
+#include "taler/taler_mhd_lib.h"
#include "taler_signatures.h"
#include "taler-donau-httpd_keys.h"
#include "taler-donau-httpd_deposits_get.h"
@@ -498,10 +498,10 @@ TEH_handler_deposits_get (struct TEH_RequestContext *rc,
{
if (GNUNET_OK !=
TALER_charity_deposit_verify (&ctx->charity,
- &ctx->coin_pub,
- &ctx->h_contract_terms,
- &ctx->h_wire,
- &ctx->charity_sig))
+ &ctx->coin_pub,
+ &ctx->h_contract_terms,
+ &ctx->h_wire,
+ &ctx->charity_sig))
{
GNUNET_break_op (0);
return TALER_MHD_reply_with_error (rc->connection,
diff --git a/src/donau/donau-httpd_terms.c b/src/donau/donau-httpd_terms.c
index aa10bc5..211ebc3 100644
--- a/src/donau/donau-httpd_terms.c
+++ b/src/donau/donau-httpd_terms.c
@@ -18,12 +18,12 @@
* @brief Handle /terms requests to return the terms of service
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <jansson.h>
#include <microhttpd.h>
-#include "taler_mhd_lib.h"
+#include "taler/taler_mhd_lib.h"
#include "taler-donau-httpd_responses.h"
/**
diff --git a/src/donau/donau-httpd_terms.h b/src/donau/donau-httpd_terms.h
index 95595fe..0537016 100644
--- a/src/donau/donau-httpd_terms.h
+++ b/src/donau/donau-httpd_terms.h
@@ -20,13 +20,13 @@
*/
#ifndef DONAU_HTTPD_TERMS_H
#define DONAU_HTTPD_TERMS_H
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <jansson.h>
#include <microhttpd.h>
-#include "taler_mhd_lib.h"
-#include "taler-donau-httpd_responses.h"
+#include "taler/taler_mhd_lib.h"
+#include "donau-httpd_responses.h"
/**
diff --git a/src/donaudb/pg_activate_signing_key.c
b/src/donaudb/pg_activate_signing_key.c
index 972af9e..a52fbf8 100644
--- a/src/donaudb/pg_activate_signing_key.c
+++ b/src/donaudb/pg_activate_signing_key.c
@@ -18,8 +18,8 @@
* @brief Implementation of the activate_signing_key function for Postgres
* @author Johannes Casaburi
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_activate_signing_key.h"
diff --git a/src/donaudb/pg_activate_signing_key.h
b/src/donaudb/pg_activate_signing_key.h
index 19394b2..c12893e 100644
--- a/src/donaudb/pg_activate_signing_key.h
+++ b/src/donaudb/pg_activate_signing_key.h
@@ -22,8 +22,8 @@
#define PG_ACTIVATE_SIGNING_KEY_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Add signing key.
diff --git a/src/donaudb/pg_add_donation_unit_key.c
b/src/donaudb/pg_add_donation_unit_key.c
index b326f07..880d0ec 100644
--- a/src/donaudb/pg_add_donation_unit_key.c
+++ b/src/donaudb/pg_add_donation_unit_key.c
@@ -18,8 +18,8 @@
* @brief Implementation of the add_donation_unit_key function for Postgres
* @author Johannes Casaburi
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_add_donation_unit_key.h"
diff --git a/src/donaudb/pg_add_donation_unit_key.h
b/src/donaudb/pg_add_donation_unit_key.h
index 5c42b43..f4cf320 100644
--- a/src/donaudb/pg_add_donation_unit_key.h
+++ b/src/donaudb/pg_add_donation_unit_key.h
@@ -22,8 +22,8 @@
#define PG_ADD_DONATION_UNIT_KEY_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Activate donation unit key, turning it into a "current" or "valid"
diff --git a/src/donaudb/pg_commit.c b/src/donaudb/pg_commit.c
index 76390bc..e9da249 100644
--- a/src/donaudb/pg_commit.c
+++ b/src/donaudb/pg_commit.c
@@ -18,8 +18,8 @@
* @brief Implementation of the commit function for Postgres
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_commit.h"
diff --git a/src/donaudb/pg_commit.h b/src/donaudb/pg_commit.h
index 650d8d9..05d6b36 100644
--- a/src/donaudb/pg_commit.h
+++ b/src/donaudb/pg_commit.h
@@ -22,8 +22,8 @@
#define PG_COMMIT_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Commit the current transaction of a database connection.
diff --git a/src/donaudb/pg_create_tables.c b/src/donaudb/pg_create_tables.c
index 6745384..1e86e19 100644
--- a/src/donaudb/pg_create_tables.c
+++ b/src/donaudb/pg_create_tables.c
@@ -18,8 +18,8 @@
* @brief Implementation of the create_tables function for Postgres
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_create_tables.h"
diff --git a/src/donaudb/pg_create_tables.h b/src/donaudb/pg_create_tables.h
index 31ae9d2..31047f1 100644
--- a/src/donaudb/pg_create_tables.h
+++ b/src/donaudb/pg_create_tables.h
@@ -22,8 +22,8 @@
#define PG_CREATE_TABLES_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Create the necessary tables if they are not present
diff --git a/src/donaudb/pg_drop_tables.c b/src/donaudb/pg_drop_tables.c
index 79b2a70..bca2201 100644
--- a/src/donaudb/pg_drop_tables.c
+++ b/src/donaudb/pg_drop_tables.c
@@ -18,8 +18,8 @@
* @brief Implementation of the drop_tables function for Postgres
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_drop_tables.h"
diff --git a/src/donaudb/pg_drop_tables.h b/src/donaudb/pg_drop_tables.h
index d79c120..f29bebd 100644
--- a/src/donaudb/pg_drop_tables.h
+++ b/src/donaudb/pg_drop_tables.h
@@ -22,8 +22,8 @@
#define PG_DROP_TABLES_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
diff --git a/src/donaudb/pg_event_listen.c b/src/donaudb/pg_event_listen.c
index a20c0ab..f8155ea 100644
--- a/src/donaudb/pg_event_listen.c
+++ b/src/donaudb/pg_event_listen.c
@@ -18,8 +18,8 @@
* @brief Implementation of the event_listen function for Postgres
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_event_listen.h"
diff --git a/src/donaudb/pg_event_listen.h b/src/donaudb/pg_event_listen.h
index 73e5497..3bd9b6f 100644
--- a/src/donaudb/pg_event_listen.h
+++ b/src/donaudb/pg_event_listen.h
@@ -22,8 +22,8 @@
#define PG_EVENT_LISTEN_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Register callback to be invoked on events of type @a es.
*
diff --git a/src/donaudb/pg_event_listen_cancel.c
b/src/donaudb/pg_event_listen_cancel.c
index ca68e0d..2f548b5 100644
--- a/src/donaudb/pg_event_listen_cancel.c
+++ b/src/donaudb/pg_event_listen_cancel.c
@@ -18,8 +18,8 @@
* @brief Implementation of the event_listen_cancel function for Postgres
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_event_listen_cancel.h"
diff --git a/src/donaudb/pg_event_listen_cancel.h
b/src/donaudb/pg_event_listen_cancel.h
index f31e778..be83220 100644
--- a/src/donaudb/pg_event_listen_cancel.h
+++ b/src/donaudb/pg_event_listen_cancel.h
@@ -22,8 +22,8 @@
#define PG_EVENT_LISTEN_CANCEL_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
diff --git a/src/donaudb/pg_event_notify.c b/src/donaudb/pg_event_notify.c
index f9d7764..5f259a0 100644
--- a/src/donaudb/pg_event_notify.c
+++ b/src/donaudb/pg_event_notify.c
@@ -18,8 +18,8 @@
* @brief Implementation of the event_notify function for Postgres
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_event_notify.h"
diff --git a/src/donaudb/pg_event_notify.h b/src/donaudb/pg_event_notify.h
index 660fefe..a8c0731 100644
--- a/src/donaudb/pg_event_notify.h
+++ b/src/donaudb/pg_event_notify.h
@@ -22,8 +22,8 @@
#define PG_EVENT_NOTIFY_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Notify all that listen on @a es of an event.
diff --git a/src/donaudb/pg_get_donation_unit_info.c
b/src/donaudb/pg_get_donation_unit_info.c
index 3600a78..284bc2e 100644
--- a/src/donaudb/pg_get_donation_unit_info.c
+++ b/src/donaudb/pg_get_donation_unit_info.c
@@ -18,8 +18,8 @@
* @brief Implementation of the get_denomination_info function for Postgres
* @author Johannes Casaburi
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_get_donation_unit_info.h"
diff --git a/src/donaudb/pg_get_donation_unit_info.h
b/src/donaudb/pg_get_donation_unit_info.h
index 8990db4..76fe514 100644
--- a/src/donaudb/pg_get_donation_unit_info.h
+++ b/src/donaudb/pg_get_donation_unit_info.h
@@ -22,8 +22,8 @@
#define PG_GET_DONATION_UNIT_INFO_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Fetch information about a donation unit key.
*
diff --git a/src/donaudb/pg_insert_charity.c b/src/donaudb/pg_insert_charity.c
index 345f096..7a2e50f 100644
--- a/src/donaudb/pg_insert_charity.c
+++ b/src/donaudb/pg_insert_charity.c
@@ -18,8 +18,8 @@
* @brief Implementation of the insert_charity function for Postgres
* @author Johannes Casaburi
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_insert_charity.h"
diff --git a/src/donaudb/pg_insert_charity.h b/src/donaudb/pg_insert_charity.h
index d308a76..90b38f6 100644
--- a/src/donaudb/pg_insert_charity.h
+++ b/src/donaudb/pg_insert_charity.h
@@ -22,8 +22,8 @@
#define PG_INSERT_CHARITY_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Add a new charity
diff --git a/src/donaudb/pg_insert_history_entry.c
b/src/donaudb/pg_insert_history_entry.c
index 07a88c7..51411f4 100644
--- a/src/donaudb/pg_insert_history_entry.c
+++ b/src/donaudb/pg_insert_history_entry.c
@@ -18,8 +18,8 @@
* @brief Implementation of the insert_history_entry function for Postgres
* @author Johannes Casaburi
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_insert_history_entry.h"
@@ -27,9 +27,9 @@
enum GNUNET_DB_QueryStatus
TEH_PG_insert_history_entry (void *cls,
- const uint64_t charity_id,
- const struct TALER_Amount *final_amount,
- const uint64_t donation_year)
+ const uint64_t charity_id,
+ const struct TALER_Amount *final_amount,
+ const uint64_t donation_year)
{
struct PostgresClosure *pg = cls;
struct GNUNET_PQ_QueryParam params[] = {
diff --git a/src/donaudb/pg_insert_history_entry.h
b/src/donaudb/pg_insert_history_entry.h
index 6e2e06e..fcf4fb4 100644
--- a/src/donaudb/pg_insert_history_entry.h
+++ b/src/donaudb/pg_insert_history_entry.h
@@ -22,8 +22,8 @@
#define PG_INSERT_HISTORY_ENTRY_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Insert history entry of a charity
@@ -36,7 +36,8 @@
*/
enum GNUNET_DB_QueryStatus
TEH_PG_insert_history_entry (void *cls,
- const uint64_t charity_id,
- const struct TALER_Amount *final_amount,
- const uint64_t donation_year);
+ const uint64_t charity_id,
+ const struct TALER_Amount *final_amount,
+ const uint64_t donation_year);
+
#endif
diff --git a/src/donaudb/pg_insert_issued_receipt.c
b/src/donaudb/pg_insert_issued_receipt.c
index 32e9168..beafcf3 100644
--- a/src/donaudb/pg_insert_issued_receipt.c
+++ b/src/donaudb/pg_insert_issued_receipt.c
@@ -18,8 +18,8 @@
* @brief Implementation of the insert_issued_receipt function for Postgres
* @author Johannes Casaburi
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_insert_issued_receipt.h"
diff --git a/src/donaudb/pg_insert_issued_receipt.h
b/src/donaudb/pg_insert_issued_receipt.h
index 7e78416..4fe1f19 100644
--- a/src/donaudb/pg_insert_issued_receipt.h
+++ b/src/donaudb/pg_insert_issued_receipt.h
@@ -22,8 +22,8 @@
#define PG_INSERT_ISSUED_RECEIPT_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Insert issued blinded donation receipt to the charity.
@@ -39,7 +39,8 @@ enum GNUNET_DB_QueryStatus
TEH_PG_insert_issued_receipt (void *cls,
const struct DONAU_CharitySignatureP
*charity_sig,
const uint64_t charity_id,
- const struct DONAU_DonationReceiptHashP
*h_receipt,
+ const struct
+ DONAU_DonationReceiptHashP *h_receipt,
const struct TALER_Amount *amount);
#endif
diff --git a/src/donaudb/pg_insert_submitted_receipt.c
b/src/donaudb/pg_insert_submitted_receipt.c
index 498b520..b50221f 100644
--- a/src/donaudb/pg_insert_submitted_receipt.c
+++ b/src/donaudb/pg_insert_submitted_receipt.c
@@ -18,8 +18,8 @@
* @brief Implementation of the insert_submitted_receipt function for Postgres
* @author Johannes Casaburi
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_insert_submitted_receipt.h"
@@ -27,11 +27,13 @@
enum GNUNET_DB_QueryStatus
TEH_PG_insert_submitted_receipt (void *cls,
- const struct TALER_TaxNumberHashP *h_tax_number,
- const struct TALER_CsNonce *nonce,
- const struct DONAU_DonationUnitPublicKey
*donation_unit_pub,
- const struct TALER_DonauSignatureP *donau_sig,
- const uint64_t donation_year)
+ const struct
+ TALER_TaxNumberHashP *h_tax_number,
+ const struct TALER_CsNonce *nonce,
+ const struct
+ DONAU_DonationUnitPublicKey
*donation_unit_pub,
+ const struct TALER_DonauSignatureP *donau_sig,
+ const uint64_t donation_year)
{
struct PostgresClosure *pg = cls;
struct GNUNET_PQ_QueryParam params[] = {
diff --git a/src/donaudb/pg_insert_submitted_receipt.h
b/src/donaudb/pg_insert_submitted_receipt.h
index 70fd8c2..d7039fc 100644
--- a/src/donaudb/pg_insert_submitted_receipt.h
+++ b/src/donaudb/pg_insert_submitted_receipt.h
@@ -22,8 +22,8 @@
#define PG_INSERT_SUBMITTED_RECEIPT_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Insert submitted donation receipt from the donor.
@@ -38,9 +38,12 @@
*/
enum GNUNET_DB_QueryStatus
TEH_PG_insert_submitted_receipt (void *cls,
- const struct TALER_TaxNumberHashP *h_tax_number,
- const struct TALER_CsNonce *nonce,
- const struct DONAU_DonationUnitPublicKey
*donation_unit_pub,
- const struct TALER_DonauSignatureP *donau_sig,
- const uint64_t donation_year);
+ const struct
+ TALER_TaxNumberHashP *h_tax_number,
+ const struct TALER_CsNonce *nonce,
+ const struct
+ DONAU_DonationUnitPublicKey
*donation_unit_pub,
+ const struct TALER_DonauSignatureP *donau_sig,
+ const uint64_t donation_year);
+
#endif
diff --git a/src/donaudb/pg_lookup_donation_unit_key.c
b/src/donaudb/pg_lookup_donation_unit_key.c
index c019801..0effb7c 100644
--- a/src/donaudb/pg_lookup_donation_unit_key.c
+++ b/src/donaudb/pg_lookup_donation_unit_key.c
@@ -18,8 +18,8 @@
* @brief Implementation of the lookup_donation_unit_key function for Postgres
* @author Johannes Casaburi
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_lookup_donation_unit_key.h"
diff --git a/src/donaudb/pg_lookup_donation_unit_key.h
b/src/donaudb/pg_lookup_donation_unit_key.h
index 1660d80..20c41e7 100644
--- a/src/donaudb/pg_lookup_donation_unit_key.h
+++ b/src/donaudb/pg_lookup_donation_unit_key.h
@@ -22,8 +22,8 @@
#define PG_LOOKUP_DONATION_UNIT_KEY_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Lookup information about current donation unit key.
*
diff --git a/src/donaudb/pg_lookup_signing_key.c
b/src/donaudb/pg_lookup_signing_key.c
index 743dda3..6fe1ff8 100644
--- a/src/donaudb/pg_lookup_signing_key.c
+++ b/src/donaudb/pg_lookup_signing_key.c
@@ -18,8 +18,8 @@
* @brief Implementation of the lookup_signing_key function for Postgres
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_lookup_signing_key.h"
diff --git a/src/donaudb/pg_lookup_signing_key.h
b/src/donaudb/pg_lookup_signing_key.h
index 8900da7..4157f68 100644
--- a/src/donaudb/pg_lookup_signing_key.h
+++ b/src/donaudb/pg_lookup_signing_key.h
@@ -22,8 +22,8 @@
#define PG_LOOKUP_SIGNING_KEY_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
diff --git a/src/donaudb/pg_preflight.c b/src/donaudb/pg_preflight.c
index f605fe2..cfdc40a 100644
--- a/src/donaudb/pg_preflight.c
+++ b/src/donaudb/pg_preflight.c
@@ -18,8 +18,8 @@
* @brief Implementation of the preflight function for Postgres
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_preflight.h"
diff --git a/src/donaudb/pg_preflight.h b/src/donaudb/pg_preflight.h
index a9ff5c4..42200ac 100644
--- a/src/donaudb/pg_preflight.h
+++ b/src/donaudb/pg_preflight.h
@@ -22,8 +22,8 @@
#define PG_PREFLIGTH_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
diff --git a/src/donaudb/pg_rollback.c b/src/donaudb/pg_rollback.c
index 6cdc0ee..1269ceb 100644
--- a/src/donaudb/pg_rollback.c
+++ b/src/donaudb/pg_rollback.c
@@ -18,8 +18,8 @@
* @brief Implementation of the rollback function for Postgres
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_rollback.h"
diff --git a/src/donaudb/pg_rollback.h b/src/donaudb/pg_rollback.h
index 0a44f02..4a5fef3 100644
--- a/src/donaudb/pg_rollback.h
+++ b/src/donaudb/pg_rollback.h
@@ -22,8 +22,8 @@
#define PG_ROLLBACK_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Roll back the current transaction of a database connection.
diff --git a/src/donaudb/pg_start.c b/src/donaudb/pg_start.c
index 42ead4c..2605cd1 100644
--- a/src/donaudb/pg_start.c
+++ b/src/donaudb/pg_start.c
@@ -18,8 +18,8 @@
* @brief Implementation of the start function for Postgres
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_preflight.h"
diff --git a/src/donaudb/pg_start.h b/src/donaudb/pg_start.h
index 81c7ba0..565a67f 100644
--- a/src/donaudb/pg_start.h
+++ b/src/donaudb/pg_start.h
@@ -22,8 +22,8 @@
#define PG_START_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Start a transaction.
diff --git a/src/donaudb/pg_start_read_committed.c
b/src/donaudb/pg_start_read_committed.c
index 9bb9251..dadfec0 100644
--- a/src/donaudb/pg_start_read_committed.c
+++ b/src/donaudb/pg_start_read_committed.c
@@ -18,8 +18,8 @@
* @brief Implementation of the start_read_committed function for Postgres
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_start_read_committed.h"
diff --git a/src/donaudb/pg_start_read_committed.h
b/src/donaudb/pg_start_read_committed.h
index 000878b..0afd30f 100644
--- a/src/donaudb/pg_start_read_committed.h
+++ b/src/donaudb/pg_start_read_committed.h
@@ -22,8 +22,8 @@
#define PG_START_READ_COMMITTED_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Start a READ COMMITTED transaction.
*
diff --git a/src/donaudb/pg_start_read_only.c b/src/donaudb/pg_start_read_only.c
index 6cab851..4dc59ae 100644
--- a/src/donaudb/pg_start_read_only.c
+++ b/src/donaudb/pg_start_read_only.c
@@ -18,8 +18,8 @@
* @brief Implementation of the start_read_only function for Postgres
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_start_read_only.h"
diff --git a/src/donaudb/pg_start_read_only.h b/src/donaudb/pg_start_read_only.h
index c176c6f..7f19ad1 100644
--- a/src/donaudb/pg_start_read_only.h
+++ b/src/donaudb/pg_start_read_only.h
@@ -22,8 +22,8 @@
#define PG_START_READ_ONLY_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Start a READ ONLY serializable transaction.
diff --git a/src/donaudb/pg_template.c b/src/donaudb/pg_template.c
index d5dc916..52d7fcd 100644
--- a/src/donaudb/pg_template.c
+++ b/src/donaudb/pg_template.c
@@ -18,8 +18,8 @@
* @brief Implementation of the template function for Postgres
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_error_codes.h"
+#include "taler/platform.h"
+#include "taler/taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
#include "pg_template.h"
diff --git a/src/donaudb/pg_template.h b/src/donaudb/pg_template.h
index a3d9113..e999929 100644
--- a/src/donaudb/pg_template.h
+++ b/src/donaudb/pg_template.h
@@ -22,8 +22,8 @@
#define PG_TEMPLATE_H
#include "taler_util.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
#endif
diff --git a/src/donaudb/test_donaudb.c b/src/donaudb/test_donaudb.c
index 8103707..177a415 100644
--- a/src/donaudb/test_donaudb.c
+++ b/src/donaudb/test_donaudb.c
@@ -20,10 +20,10 @@
* @author Christian Grothoff
* @author Marcello Stanisci
*/
-#include "platform.h"
+#include "taler/platform.h"
#include "taler_donaudb_lib.h"
-#include "taler_json_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "taler/taler_json_lib.h"
+#include "donaudb_plugin.h"
/**
* Global result from the testcase.
@@ -2154,8 +2154,8 @@ run (void *cls)
&bad_idx,
&ctr_conflict));
TALER_charity_wire_signature_hash (bd.receiver_wire_account,
- &bd.wire_salt,
- &h_wire);
+ &bd.wire_salt,
+ &h_wire);
FAILIF (1 !=
plugin->have_deposit2 (plugin->cls,
&bd.h_contract_terms,
@@ -2322,8 +2322,8 @@ run (void *cls)
struct TALER_Amount deposit_fee;
TALER_charity_wire_signature_hash (bd.receiver_wire_account,
- &bd.wire_salt,
- &h_wire);
+ &bd.wire_salt,
+ &h_wire);
FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
plugin->have_deposit2 (plugin->cls,
&bd.h_contract_terms,
diff --git a/src/include/donau_service.h b/src/include/donau_service.h
index 413f4e0..9094ed5 100644
--- a/src/include/donau_service.h
+++ b/src/include/donau_service.h
@@ -27,7 +27,7 @@
#include <jansson.h>
#include "taler_util.h"
#include "taler_donau_util.h"
-#include "taler_error_codes.h"
+#include "taler/taler_error_codes.h"
#include "taler_kyclogic_lib.h"
#include <gnunet/gnunet_curl_lib.h>
diff --git a/src/json/test_json.c b/src/json/test_json.c
index d37f66e..2fc852a 100644
--- a/src/json/test_json.c
+++ b/src/json/test_json.c
@@ -19,9 +19,9 @@
* @brief Tests for Taler-specific crypto logic
* @author Christian Grothoff <christian@grothoff.org>
*/
-#include "platform.h"
+#include "taler/platform.h"
#include "taler_util.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
/**
diff --git a/src/lib/donau_api_batch_issue_receipts.c
b/src/lib/donau_api_batch_issue_receipts.c
index a409c78..30bc19b 100644
--- a/src/lib/donau_api_batch_issue_receipts.c
+++ b/src/lib/donau_api_batch_issue_receipts.c
@@ -19,14 +19,14 @@
* @brief Implementation of /reserves/$RESERVE_PUB/batch-withdraw requests
with blinding/unblinding
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <jansson.h>
#include <microhttpd.h> /* just for HTTP status codes */
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <gnunet/gnunet_curl_lib.h>
#include "taler_donau_service.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "donau_api_handle.h"
#include "taler_signatures.h"
#include "donau_api_curl_defaults.h"
diff --git a/src/lib/donau_api_batch_issue_receipts2.c
b/src/lib/donau_api_batch_issue_receipts2.c
index 6b9d37f..274e86d 100644
--- a/src/lib/donau_api_batch_issue_receipts2.c
+++ b/src/lib/donau_api_batch_issue_receipts2.c
@@ -19,14 +19,14 @@
* @brief Implementation of /reserves/$RESERVE_PUB/batch-withdraw requests
without blinding/unblinding
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <jansson.h>
#include <microhttpd.h> /* just for HTTP status codes */
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <gnunet/gnunet_curl_lib.h>
#include "taler_donau_service.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "donau_api_handle.h"
#include "taler_signatures.h"
#include "donau_api_curl_defaults.h"
@@ -230,11 +230,11 @@ reserve_batch_withdraw_payment_required (
{
GNUNET_break_op (0);
DONAU_free_reserve_history (len,
- rhistory);
+ rhistory);
return GNUNET_SYSERR;
}
DONAU_free_reserve_history (len,
- rhistory);
+ rhistory);
}
/* Check that funds were really insufficient */
@@ -450,7 +450,7 @@ DONAU_batch_withdraw2 (
json_t *withdraw_obj;
dk = DONAU_get_denomination_key_by_hash (keys,
- &pd->denom_pub_hash);
+ &pd->denom_pub_hash);
if (NULL == dk)
{
DONAU_batch_withdraw2_cancel (wh);
diff --git a/src/lib/donau_api_batch_submit_receipts.c
b/src/lib/donau_api_batch_submit_receipts.c
index 42fb5ba..655815f 100644
--- a/src/lib/donau_api_batch_submit_receipts.c
+++ b/src/lib/donau_api_batch_submit_receipts.c
@@ -20,13 +20,13 @@
* @author Sree Harsha Totakura <sreeharsha@totakura.in>
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <jansson.h>
#include <microhttpd.h> /* just for HTTP status codes */
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <gnunet/gnunet_curl_lib.h>
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "taler_auditor_service.h"
#include "taler_donau_service.h"
#include "donau_api_common.h"
@@ -269,10 +269,10 @@ auditor_cb (void *cls,
"Will provide deposit confirmation to auditor `%s'\n",
TALER_B2S (auditor_pub));
dki = DONAU_get_denomination_key_by_hash (dh->keys,
-
&dh->cdds[coin].h_denom_pub);
+ &dh->cdds[coin].h_denom_pub);
GNUNET_assert (NULL != dki);
spk = DONAU_get_signing_key_info (dh->keys,
- &dh->donau_pub);
+ &dh->donau_pub);
if (NULL == spk)
{
GNUNET_break_op (0);
@@ -375,10 +375,10 @@ handle_deposit_finished (void *cls,
break;
}
dh->donau_sigs = GNUNET_new_array (dh->num_cdds,
- struct TALER_DonauSignatureP);
+ struct TALER_DonauSignatureP);
if (GNUNET_OK !=
DONAU_test_signing_key (dh->keys,
- &dh->donau_pub))
+ &dh->donau_pub))
{
GNUNET_break_op (0);
dr->hr.http_status = 0;
@@ -406,8 +406,8 @@ handle_deposit_finished (void *cls,
break;
}
dki = DONAU_get_denomination_key_by_hash (dh->keys,
- &dh->cdds[idx].
- h_denom_pub);
+ &dh->cdds[idx].
+ h_denom_pub);
GNUNET_assert (NULL != dki);
GNUNET_assert (0 <=
TALER_amount_subtract (&amount_without_fee,
@@ -490,8 +490,8 @@ handle_deposit_finished (void *cls,
&dh->cdds[i].coin_pub))
continue;
dki = DONAU_get_denomination_key_by_hash (dh->keys,
- &dh->cdds[i].
- h_denom_pub);
+ &dh->cdds[i].
+ h_denom_pub);
GNUNET_assert (NULL != dki);
if (GNUNET_OK !=
DONAU_check_coin_conflict_ (
@@ -592,8 +592,8 @@ DONAU_batch_deposit (
TALER_deposit_policy_hash (dcd->policy_details,
&dh->h_policy);
TALER_charity_wire_signature_hash (dcd->charity_payto_uri,
- &dcd->wire_salt,
- &dh->h_wire);
+ &dcd->wire_salt,
+ &dh->h_wire);
deposits = json_array ();
GNUNET_assert (NULL != deposits);
for (unsigned int i = 0; i<num_cdds; i++)
@@ -603,7 +603,7 @@ DONAU_batch_deposit (
const struct TALER_AgeCommitmentHash *h_age_commitmentp;
dki = DONAU_get_denomination_key_by_hash (keys,
- &cdd->h_denom_pub);
+ &cdd->h_denom_pub);
if (NULL == dki)
{
*ec = TALER_EC_DONAU_GENERIC_DENOMINATION_KEY_UNKNOWN;
@@ -630,10 +630,10 @@ DONAU_batch_deposit (
if (GNUNET_OK !=
DONAU_verify_deposit_signature_ (dcd,
- &dh->h_policy,
- &dh->h_wire,
- cdd,
- dki))
+ &dh->h_policy,
+ &dh->h_wire,
+ cdd,
+ dki))
{
*ec = TALER_EC_DONAU_DEPOSIT_COIN_SIGNATURE_INVALID;
GNUNET_break_op (0);
diff --git a/src/lib/donau_api_charities_close.c
b/src/lib/donau_api_charities_close.c
index b1e5c2a..be1ad2a 100644
--- a/src/lib/donau_api_charities_close.c
+++ b/src/lib/donau_api_charities_close.c
@@ -19,14 +19,14 @@
* @brief Implementation of the POST /reserves/$RESERVE_PUB/close requests
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <jansson.h>
#include <microhttpd.h> /* just for HTTP close codes */
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <gnunet/gnunet_curl_lib.h>
#include "taler_donau_service.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "donau_api_handle.h"
#include "taler_signatures.h"
#include "donau_api_curl_defaults.h"
diff --git a/src/lib/donau_api_charities_get.c
b/src/lib/donau_api_charities_get.c
index ab4314b..1ad6874 100644
--- a/src/lib/donau_api_charities_get.c
+++ b/src/lib/donau_api_charities_get.c
@@ -19,14 +19,14 @@
* @brief Implementation of the GET /reserves/$RESERVE_PUB requests
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <jansson.h>
#include <microhttpd.h> /* just for HTTP status codes */
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <gnunet/gnunet_curl_lib.h>
#include "taler_donau_service.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "donau_api_handle.h"
#include "taler_signatures.h"
#include "donau_api_curl_defaults.h"
diff --git a/src/lib/donau_api_charities_history.c
b/src/lib/donau_api_charities_history.c
index 52b74b5..335e7a6 100644
--- a/src/lib/donau_api_charities_history.c
+++ b/src/lib/donau_api_charities_history.c
@@ -19,14 +19,14 @@
* @brief Implementation of the POST /reserves/$RESERVE_PUB/history requests
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <jansson.h>
#include <microhttpd.h> /* just for HTTP history codes */
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <gnunet/gnunet_curl_lib.h>
#include "taler_donau_service.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "donau_api_handle.h"
#include "taler_signatures.h"
#include "donau_api_curl_defaults.h"
@@ -132,17 +132,17 @@ handle_reserves_history_ok (struct
DONAU_ReservesHistoryHandle *rsh,
struct DONAU_ReserveHistoryEntry);
if (GNUNET_OK !=
DONAU_parse_reserve_history (rsh->keys,
- history,
- &rsh->reserve_pub,
- rs.details.ok.balance.currency,
- &rs.details.ok.total_in,
- &rs.details.ok.total_out,
- len,
- rhistory))
+ history,
+ &rsh->reserve_pub,
+ rs.details.ok.balance.currency,
+ &rs.details.ok.total_in,
+ &rs.details.ok.total_out,
+ len,
+ rhistory))
{
GNUNET_break_op (0);
DONAU_free_reserve_history (len,
- rhistory);
+ rhistory);
return GNUNET_SYSERR;
}
if (NULL != rsh->cb)
@@ -154,7 +154,7 @@ handle_reserves_history_ok (struct
DONAU_ReservesHistoryHandle *rsh,
rsh->cb = NULL;
}
DONAU_free_reserve_history (len,
- rhistory);
+ rhistory);
}
return GNUNET_OK;
}
@@ -300,7 +300,7 @@ DONAU_reserves_history (
return NULL;
}
gf = DONAU_get_global_fee (keys,
- rsh->ts);
+ rsh->ts);
if (NULL == gf)
{
GNUNET_break_op (0);
diff --git a/src/lib/donau_api_charities_open.c
b/src/lib/donau_api_charities_open.c
index 8485372..f2509d8 100644
--- a/src/lib/donau_api_charities_open.c
+++ b/src/lib/donau_api_charities_open.c
@@ -19,14 +19,14 @@
* @brief Implementation of the POST /reserves/$RESERVE_PUB/open requests
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <jansson.h>
#include <microhttpd.h> /* just for HTTP open codes */
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <gnunet/gnunet_curl_lib.h>
#include "taler_donau_service.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "donau_api_common.h"
#include "donau_api_handle.h"
#include "taler_signatures.h"
@@ -360,7 +360,7 @@ handle_reserves_open_finished (void *cls,
break;
}
dk = DONAU_get_denomination_key_by_hash (roh->keys,
- &cd->h_denom_pub);
+ &cd->h_denom_pub);
if (NULL == dk)
{
GNUNET_break_op (0);
@@ -370,11 +370,11 @@ handle_reserves_open_finished (void *cls,
}
if (GNUNET_OK !=
DONAU_check_coin_conflict_ (roh->keys,
- j,
- dk,
- &coin_pub,
- &cd->coin_sig,
- &cd->contribution))
+ j,
+ dk,
+ &coin_pub,
+ &cd->coin_sig,
+ &cd->contribution))
{
GNUNET_break_op (0);
rs.hr.http_status = 0;
diff --git a/src/lib/donau_api_charities_status.c
b/src/lib/donau_api_charities_status.c
index 46537d1..4ef7200 100644
--- a/src/lib/donau_api_charities_status.c
+++ b/src/lib/donau_api_charities_status.c
@@ -19,14 +19,14 @@
* @brief Implementation of the POST /reserves/$RESERVE_PUB/status requests
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <jansson.h>
#include <microhttpd.h> /* just for HTTP status codes */
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <gnunet/gnunet_curl_lib.h>
#include "taler_donau_service.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "donau_api_handle.h"
#include "taler_signatures.h"
#include "donau_api_curl_defaults.h"
@@ -120,17 +120,17 @@ handle_reserves_status_ok (struct
DONAU_ReservesStatusHandle *rsh,
struct DONAU_ReserveHistoryEntry);
if (GNUNET_OK !=
DONAU_parse_reserve_history (rsh->keys,
- history,
- &rsh->reserve_pub,
- rs.details.ok.balance.currency,
- &rs.details.ok.total_in,
- &rs.details.ok.total_out,
- len,
- rhistory))
+ history,
+ &rsh->reserve_pub,
+ rs.details.ok.balance.currency,
+ &rs.details.ok.total_in,
+ &rs.details.ok.total_out,
+ len,
+ rhistory))
{
GNUNET_break_op (0);
DONAU_free_reserve_history (len,
- rhistory);
+ rhistory);
GNUNET_JSON_parse_free (spec);
return GNUNET_SYSERR;
}
@@ -143,7 +143,7 @@ handle_reserves_status_ok (struct
DONAU_ReservesStatusHandle *rsh,
rsh->cb = NULL;
}
DONAU_free_reserve_history (len,
- rhistory);
+ rhistory);
}
return GNUNET_OK;
}
diff --git a/src/lib/donau_api_common.c b/src/lib/donau_api_common.c
index 9c98910..7f4c4af 100644
--- a/src/lib/donau_api_common.c
+++ b/src/lib/donau_api_common.c
@@ -19,8 +19,8 @@
* @brief common functions for the donau API
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "donau_api_common.h"
#include "donau_api_handle.h"
@@ -189,7 +189,7 @@ parse_withdraw (struct DONAU_ReserveHistoryEntry *rh,
key_state = uc->keys;
dki = DONAU_get_denomination_key_by_hash (key_state,
- &h_denom_pub);
+ &h_denom_pub);
if ( (GNUNET_YES !=
TALER_amount_cmp_currency (&withdraw_fee,
&dki->fees.withdraw)) ||
@@ -278,8 +278,8 @@ parse_recoup (struct DONAU_ReserveHistoryEntry *rh,
key_state = uc->keys;
if (GNUNET_OK !=
DONAU_test_signing_key (key_state,
- &rh->details.
- recoup_details.donau_pub))
+ &rh->details.
+ recoup_details.donau_pub))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
@@ -1055,11 +1055,11 @@ help_refund (struct CoinHistoryParseContext *pc,
}
if (GNUNET_OK !=
TALER_charity_refund_verify (pc->coin_pub,
- &h_contract_terms,
- rtransaction_id,
- &sig_amount,
- &charity_pub,
- &sig))
+ &h_contract_terms,
+ rtransaction_id,
+ &sig_amount,
+ &charity_pub,
+ &sig))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
@@ -1906,9 +1906,9 @@ DONAU_check_coin_amount_conflict_ (
}
if (GNUNET_OK !=
DONAU_verify_coin_history (dki,
- coin_pub,
- history,
- &total))
+ coin_pub,
+ history,
+ &total))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
diff --git a/src/lib/donau_api_common.h b/src/lib/donau_api_common.h
index 5ca4adf..12f1941 100644
--- a/src/lib/donau_api_common.h
+++ b/src/lib/donau_api_common.h
@@ -22,7 +22,7 @@
#ifndef DONAU_API_COMMON_H
#define DONAU_API_COMMON_H
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "taler_donau_service.h"
diff --git a/src/lib/donau_api_csr_issue_receipts.c
b/src/lib/donau_api_csr_issue_receipts.c
index 7acc353..a1565c2 100644
--- a/src/lib/donau_api_csr_issue_receipts.c
+++ b/src/lib/donau_api_csr_issue_receipts.c
@@ -20,14 +20,14 @@
* @author Lucien Heuzeveldt
* @author Gian Demarmels
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <jansson.h>
#include <microhttpd.h> /* just for HTTP status codes */
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <gnunet/gnunet_curl_lib.h>
#include "taler_donau_service.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "donau_api_handle.h"
#include "taler_signatures.h"
#include "donau_api_curl_defaults.h"
@@ -266,7 +266,7 @@ DONAU_csr_withdraw (
void
DONAU_csr_withdraw_cancel (struct
- DONAU_CsRWithdrawHandle *csrh)
+ DONAU_CsRWithdrawHandle *csrh)
{
if (NULL != csrh->job)
{
diff --git a/src/lib/donau_api_handle.c b/src/lib/donau_api_handle.c
index 91391e2..8f57bd7 100644
--- a/src/lib/donau_api_handle.c
+++ b/src/lib/donau_api_handle.c
@@ -24,10 +24,10 @@
* @author Christian Grothoff
* @author Lukas Matyja
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <microhttpd.h>
#include <gnunet/gnunet_curl_lib.h>
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "taler_donau_service.h"
#include "taler_signatures.h"
#include "donau_api_handle.h"
@@ -551,9 +551,9 @@ decode_keys_json (const json_t *resp_obj,
json_array_size (accounts));
EXITIF (GNUNET_OK !=
DONAU_parse_accounts (&key_data->master_pub,
- accounts,
- key_data->accounts_len,
- key_data->accounts));
+ accounts,
+ key_data->accounts_len,
+ key_data->accounts));
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Parsed %u wire accounts from JSON\n",
@@ -657,7 +657,7 @@ decode_keys_json (const json_t *resp_obj,
j++)
{
if (0 == GNUNET_CRYPTO_bsign_pub_cmp (&dk,
- &key_data->denom_keys[j]))
+ &key_data->denom_keys[j]))
{
found = true;
break;
@@ -803,7 +803,7 @@ decode_keys_json (const json_t *resp_obj,
{
EXITIF (GNUNET_OK !=
DONAU_test_signing_key (key_data,
- &pub));
+ &pub));
EXITIF (GNUNET_OK !=
TALER_donau_online_key_set_verify (
key_data->list_issue_date,
@@ -1326,7 +1326,7 @@ DONAU_keys_decref (struct DONAU_Keys *keys)
keys->auditors_size,
0);
DONAU_free_accounts (keys->accounts_len,
- keys->accounts);
+ keys->accounts);
GNUNET_array_grow (keys->accounts,
keys->accounts_len,
0);
diff --git a/src/lib/donau_api_issue_receipts.c
b/src/lib/donau_api_issue_receipts.c
index c2976fd..dc62019 100644
--- a/src/lib/donau_api_issue_receipts.c
+++ b/src/lib/donau_api_issue_receipts.c
@@ -19,14 +19,14 @@
* @brief Implementation of /reserves/$RESERVE_PUB/withdraw requests with
blinding/unblinding
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <jansson.h>
#include <microhttpd.h> /* just for HTTP status codes */
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <gnunet/gnunet_curl_lib.h>
#include "taler_donau_service.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "donau_api_handle.h"
#include "taler_signatures.h"
#include "donau_api_curl_defaults.h"
@@ -243,12 +243,12 @@ withdraw_cs_stage_two_callback (
break;
}
wh->wh2 = DONAU_withdraw2 (wh->curl_ctx,
- wh->donau_url,
- wh->keys,
- &wh->pd,
- wh->reserve_priv,
- &handle_reserve_withdraw_finished,
- wh);
+ wh->donau_url,
+ wh->keys,
+ &wh->pd,
+ wh->reserve_priv,
+ &handle_reserve_withdraw_finished,
+ wh);
return;
default:
break;
@@ -309,12 +309,12 @@ DONAU_withdraw (
return NULL;
}
wh->wh2 = DONAU_withdraw2 (curl_ctx,
- donau_url,
- keys,
- &wh->pd,
- wh->reserve_priv,
- &handle_reserve_withdraw_finished,
- wh);
+ donau_url,
+ keys,
+ &wh->pd,
+ wh->reserve_priv,
+ &handle_reserve_withdraw_finished,
+ wh);
break;
}
case TALER_DENOMINATION_CS:
diff --git a/src/lib/donau_api_issue_receipts2.c
b/src/lib/donau_api_issue_receipts2.c
index aa00288..f2c5fc4 100644
--- a/src/lib/donau_api_issue_receipts2.c
+++ b/src/lib/donau_api_issue_receipts2.c
@@ -19,14 +19,14 @@
* @brief Implementation of /reserves/$RESERVE_PUB/withdraw requests without
blinding/unblinding
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <jansson.h>
#include <microhttpd.h> /* just for HTTP status codes */
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <gnunet/gnunet_curl_lib.h>
#include "taler_donau_service.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "donau_api_handle.h"
#include "taler_signatures.h"
#include "donau_api_curl_defaults.h"
@@ -193,21 +193,21 @@ reserve_withdraw_payment_required (
if (GNUNET_OK !=
DONAU_parse_reserve_history (wh->keys,
- history,
- &wh->reserve_pub,
- balance.currency,
- &total_in_from_history,
- &total_out_from_history,
- len,
- rhistory))
+ history,
+ &wh->reserve_pub,
+ balance.currency,
+ &total_in_from_history,
+ &total_out_from_history,
+ len,
+ rhistory))
{
GNUNET_break_op (0);
DONAU_free_reserve_history (len,
- rhistory);
+ rhistory);
return GNUNET_SYSERR;
}
DONAU_free_reserve_history (len,
- rhistory);
+ rhistory);
}
/* Check that funds were really insufficient */
@@ -377,7 +377,7 @@ DONAU_withdraw2 (
GNUNET_assert (NULL != keys);
dk = DONAU_get_denomination_key_by_hash (keys,
- &pd->denom_pub_hash);
+ &pd->denom_pub_hash);
if (NULL == dk)
{
GNUNET_break (0);
diff --git a/src/lib/donau_api_submit_receipts_get.c
b/src/lib/donau_api_submit_receipts_get.c
index 48f5c62..801dad0 100644
--- a/src/lib/donau_api_submit_receipts_get.c
+++ b/src/lib/donau_api_submit_receipts_get.c
@@ -19,13 +19,13 @@
* @brief Implementation of the /deposits/ GET request
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <jansson.h>
#include <microhttpd.h> /* just for HTTP status codes */
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <gnunet/gnunet_curl_lib.h>
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "taler_donau_service.h"
#include "donau_api_handle.h"
#include "taler_signatures.h"
@@ -145,7 +145,7 @@ handle_deposit_wtid_finished (void *cls,
}
if (GNUNET_OK !=
DONAU_test_signing_key (key_state,
- &dr.details.ok.donau_pub))
+ &dr.details.ok.donau_pub))
{
GNUNET_break_op (0);
dr.hr.http_status = 0;
@@ -279,10 +279,10 @@ DONAU_deposits_get (
GNUNET_CRYPTO_eddsa_key_get_public (&charity_priv->eddsa_priv,
&charity.eddsa_pub);
TALER_charity_deposit_sign (h_contract_terms,
- h_wire,
- coin_pub,
- charity_priv,
- &charity_sig);
+ h_wire,
+ coin_pub,
+ charity_priv,
+ &charity_sig);
{
char cpub_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2];
char mpub_str[sizeof (struct DONAU_CharityPublicKeyP) * 2];
diff --git a/src/lib/donau_api_transfers_get.c
b/src/lib/donau_api_transfers_get.c
index a83eafb..e639c9b 100644
--- a/src/lib/donau_api_transfers_get.c
+++ b/src/lib/donau_api_transfers_get.c
@@ -19,13 +19,13 @@
* @brief Implementation of the GET /transfers/ request
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <jansson.h>
#include <microhttpd.h> /* just for HTTP status codes */
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_curl_lib.h>
#include "taler_donau_service.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include "donau_api_handle.h"
#include "taler_signatures.h"
#include "donau_api_curl_defaults.h"
diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c
index c710247..6451d14 100644
--- a/src/pq/pq_result_helper.c
+++ b/src/pq/pq_result_helper.c
@@ -18,7 +18,7 @@
* @brief functions to initialize parameter arrays
* @author Christian Grothoff
*/
-// #include "platform.h"
+// #include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
// #include "pq_common.h"
// #include "taler_pq_lib.h"
diff --git a/src/pq/test_pq.c b/src/pq/test_pq.c
index 237c8a9..c438c5e 100644
--- a/src/pq/test_pq.c
+++ b/src/pq/test_pq.c
@@ -18,7 +18,7 @@
* @brief Tests for Postgres convenience API
* @author Christian Grothoff <christian@grothoff.org>
*/
-#include "platform.h"
+#include "taler/platform.h"
#include "taler_util.h"
#include "taler_pq_lib.h"
diff --git a/src/testing/test_donau_api.c b/src/testing/test_donau_api.c
index cfa9dff..3770b8f 100644
--- a/src/testing/test_donau_api.c
+++ b/src/testing/test_donau_api.c
@@ -23,18 +23,18 @@
* @author Christian Grothoff
* @author Marcello Stanisci
*/
-#include "platform.h"
+#include "taler/platform.h"
#include "taler_util.h"
#include "taler_signatures.h"
#include "taler_donau_service.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_testing_lib.h>
#include <microhttpd.h>
#include "taler_bank_service.h"
#include "taler_fakebank_lib.h"
#include "taler_testing_lib.h"
-#include "taler_extensions.h"
+#include "taler/taler_extensions.h"
/**
* Configuration file we use. One (big) configuration is used
@@ -114,7 +114,7 @@ run (void *cls,
* Move money to the donau's bank account.
*/
CMD_TRANSFER_TO_DONAU ("create-reserve-1",
- "EUR:6.02"),
+ "EUR:6.02"),
TALER_TESTING_cmd_reserve_poll ("poll-reserve-1",
"create-reserve-1",
"EUR:6.02",
@@ -259,7 +259,7 @@ run (void *cls,
/* Fill reserve with EUR:5, 1ct is for fees. */
CMD_TRANSFER_TO_DONAU ("refresh-create-reserve-1",
- "EUR:5.01"),
+ "EUR:5.01"),
TALER_TESTING_cmd_check_bank_admin_transfer ("ck-refresh-create-reserve-1",
"EUR:5.01",
cred.user42_payto,
@@ -367,7 +367,7 @@ run (void *cls,
* Move money to the donau's bank account.
*/
CMD_TRANSFER_TO_DONAU ("create-reserve-age",
- "EUR:6.01"),
+ "EUR:6.01"),
TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-age",
"EUR:6.01",
cred.user42_payto,
@@ -519,7 +519,7 @@ run (void *cls,
struct TALER_TESTING_Command unaggregation[] = {
TALER_TESTING_cmd_check_bank_empty ("far-future-aggregation-a"),
CMD_TRANSFER_TO_DONAU ("create-reserve-unaggregated",
- "EUR:5.01"),
+ "EUR:5.01"),
/* "consume" reserve creation transfer. */
TALER_TESTING_cmd_check_bank_admin_transfer (
"check-create-reserve-unaggregated",
@@ -554,7 +554,7 @@ run (void *cls,
struct TALER_TESTING_Command refresh_age[] = {
/* Fill reserve with EUR:5, 1ct is for fees. */
CMD_TRANSFER_TO_DONAU ("refresh-create-reserve-age-1",
- "EUR:6.01"),
+ "EUR:6.01"),
TALER_TESTING_cmd_check_bank_admin_transfer (
"ck-refresh-create-reserve-age-1",
"EUR:6.01",
@@ -654,7 +654,7 @@ run (void *cls,
*/
struct TALER_TESTING_Command aggregation[] = {
CMD_TRANSFER_TO_DONAU ("create-reserve-aggtest",
- "EUR:5.01"),
+ "EUR:5.01"),
/* "consume" reserve creation transfer. */
TALER_TESTING_cmd_check_bank_admin_transfer (
"check-create-reserve-aggtest",
@@ -701,7 +701,7 @@ run (void *cls,
* config.
*/
CMD_TRANSFER_TO_DONAU ("create-reserve-r1",
- "EUR:5.01"),
+ "EUR:5.01"),
TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-r1",
"EUR:5.01",
cred.user42_payto,
@@ -806,7 +806,7 @@ run (void *cls,
* refund deadline
*/
CMD_TRANSFER_TO_DONAU ("create-reserve-rb",
- "EUR:5.01"),
+ "EUR:5.01"),
TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-rb",
"EUR:5.01",
cred.user42_payto,
@@ -851,7 +851,7 @@ run (void *cls,
* config.
*/
CMD_TRANSFER_TO_DONAU ("recoup-create-reserve-1",
- "EUR:15.02"),
+ "EUR:15.02"),
TALER_TESTING_cmd_check_bank_admin_transfer (
"recoup-create-reserve-1-check",
"EUR:15.02",
@@ -982,7 +982,7 @@ run (void *cls,
* the aggregator is given a config file that overrides
* the reserve expiration time (making it now-ish) */
CMD_TRANSFER_TO_DONAU ("short-lived-reserve",
- "EUR:5.01"),
+ "EUR:5.01"),
TALER_TESTING_cmd_check_bank_admin_transfer ("check-short-lived-reserve",
"EUR:5.01",
cred.user42_payto,
@@ -1019,7 +1019,7 @@ run (void *cls,
* fails. Do not use EUR:5 here as the EUR:5 coin was
* revoked and we did not bother to create a new one... */
CMD_TRANSFER_TO_DONAU ("recoup-create-reserve-2",
- "EUR:2.02"),
+ "EUR:2.02"),
TALER_TESTING_cmd_check_bank_admin_transfer ("ck-recoup-create-reserve-2",
"EUR:2.02",
cred.user42_payto,
@@ -1089,7 +1089,7 @@ run (void *cls,
MHD_HTTP_GONE),
/* Test that revoked coins cannot be withdrawn */
CMD_TRANSFER_TO_DONAU ("recoup-create-reserve-3",
- "EUR:1.01"),
+ "EUR:1.01"),
TALER_TESTING_cmd_check_bank_admin_transfer (
"check-recoup-create-reserve-3",
"EUR:1.01",
@@ -1116,7 +1116,7 @@ run (void *cls,
* Move money to the donau's bank account.
*/
CMD_TRANSFER_TO_DONAU ("create-batch-reserve-1",
- "EUR:6.03"),
+ "EUR:6.03"),
TALER_TESTING_cmd_reserve_poll ("poll-batch-reserve-1",
"create-batch-reserve-1",
"EUR:6.03",
@@ -1191,7 +1191,7 @@ run (void *cls,
{
reserve_open_close[(i * RESERVE_OPEN_CLOSE_CHUNK) + 0]
= CMD_TRANSFER_TO_DONAU ("reserve-open-close-key",
- "EUR:20");
+ "EUR:20");
reserve_open_close[(i * RESERVE_OPEN_CLOSE_CHUNK) + 1]
= TALER_TESTING_cmd_exec_wirewatch2 ("reserve-open-close-wirewatch",
config_file_expire_reserve_now,
@@ -1221,10 +1221,10 @@ run (void *cls,
"-e",
NULL),
TALER_TESTING_cmd_get_donau ("get-donau",
- cred.cfg,
- NULL,
- true,
- true),
+ cred.cfg,
+ NULL,
+ true,
+ true),
TALER_TESTING_cmd_batch ("withdraw",
withdraw),
TALER_TESTING_cmd_batch ("spend",
diff --git a/src/testing/testing_api_cmd_batch.c
b/src/testing/testing_api_cmd_batch.c
index 276ba87..9b80d79 100644
--- a/src/testing/testing_api_cmd_batch.c
+++ b/src/testing/testing_api_cmd_batch.c
@@ -21,8 +21,8 @@
* @brief Implement batch-execution of CMDs.
* @author Marcello Stanisci
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_testing_lib.h"
diff --git a/src/testing/testing_api_cmd_batch_deposit.c
b/src/testing/testing_api_cmd_batch_deposit.c
index d520c6b..67ed5a5 100644
--- a/src/testing/testing_api_cmd_batch_deposit.c
+++ b/src/testing/testing_api_cmd_batch_deposit.c
@@ -22,8 +22,8 @@
* @author Marcello Stanisci
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_testing_lib.h"
#include "taler_signatures.h"
@@ -215,9 +215,9 @@ batch_deposit_cb (void *cls,
ds->donau_timestamp = dr->details.ok.deposit_timestamp;
ds->donau_pub = *dr->details.ok.donau_pub;
ds->donau_sigs = GNUNET_memdup (dr->details.ok.donau_sigs,
- dr->details.ok.num_signatures
- * sizeof (struct
- TALER_DonauSignatureP));
+ dr->details.ok.num_signatures
+ * sizeof (struct
+ TALER_DonauSignatureP));
}
TALER_TESTING_interpreter_next (ds->is);
}
@@ -288,7 +288,7 @@ batch_deposit_run (void *cls,
}
GNUNET_assert (GNUNET_OK ==
TALER_JSON_charity_wire_signature_hash (ds->wire_details,
- &h_wire));
+ &h_wire));
if (! GNUNET_TIME_absolute_is_zero (ds->refund_deadline.abs_time))
{
struct GNUNET_TIME_Relative refund_deadline;
@@ -496,9 +496,9 @@ batch_deposit_traits (void *cls,
/* First two traits are only available if
ds->traits is #GNUNET_YES */
TALER_TESTING_make_trait_donau_pub (index,
- &ds->donau_pub),
+ &ds->donau_pub),
TALER_TESTING_make_trait_donau_sig (index,
- &ds->donau_sigs[index]),
+ &ds->donau_sigs[index]),
/* These traits are always available */
TALER_TESTING_make_trait_wire_details (ds->wire_details),
TALER_TESTING_make_trait_contract_terms (ds->contract_terms),
diff --git a/src/testing/testing_api_cmd_batch_withdraw.c
b/src/testing/testing_api_cmd_batch_withdraw.c
index 676d99b..74ba0f1 100644
--- a/src/testing/testing_api_cmd_batch_withdraw.c
+++ b/src/testing/testing_api_cmd_batch_withdraw.c
@@ -22,13 +22,13 @@
* @author Christian Grothoff
* @author Marcello Stanisci
*/
-#include "platform.h"
+#include "taler/platform.h"
#include "taler_donau_service.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include <microhttpd.h>
#include <gnunet/gnunet_curl_lib.h>
#include "taler_signatures.h"
-#include "taler_extensions.h"
+#include "taler/taler_extensions.h"
#include "taler_testing_lib.h"
/**
@@ -407,7 +407,7 @@ batch_withdraw_traits (void *cls,
TALER_TESTING_make_trait_blinding_key (index,
&cs->bks),
TALER_TESTING_make_trait_donau_wd_value (index,
- &cs->donau_vals),
+ &cs->donau_vals),
TALER_TESTING_make_trait_denom_pub (index,
cs->pk),
TALER_TESTING_make_trait_denom_sig (index,
diff --git a/src/testing/testing_api_cmd_common.c
b/src/testing/testing_api_cmd_common.c
index c1e11bd..cc444e0 100644
--- a/src/testing/testing_api_cmd_common.c
+++ b/src/testing/testing_api_cmd_common.c
@@ -21,7 +21,7 @@
* @brief common functions for commands
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include "taler_testing_lib.h"
diff --git a/src/testing/testing_api_cmd_deposit.c
b/src/testing/testing_api_cmd_deposit.c
index 95f6503..eb33efe 100644
--- a/src/testing/testing_api_cmd_deposit.c
+++ b/src/testing/testing_api_cmd_deposit.c
@@ -21,8 +21,8 @@
* @brief command for testing /deposit.
* @author Marcello Stanisci
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_testing_lib.h"
#include "taler_signatures.h"
@@ -352,7 +352,7 @@ deposit_run (void *cls,
}
if ( (GNUNET_OK !=
TALER_TESTING_get_trait_charity_priv (cmd,
- &charity_priv)) )
+ &charity_priv)) )
{
GNUNET_break (0);
TALER_TESTING_interpreter_fail (is);
@@ -436,7 +436,7 @@ deposit_run (void *cls,
GNUNET_assert (GNUNET_OK ==
TALER_JSON_charity_wire_signature_hash (ds->wire_details,
- &h_wire));
+ &h_wire));
TALER_wallet_deposit_sign (&ds->amount,
&denom_pub->fees.deposit,
&h_wire,
@@ -589,9 +589,9 @@ deposit_traits (void *cls,
/* First two traits are only available if
ds->traits is #GNUNET_YES */
TALER_TESTING_make_trait_donau_pub (0,
- &ds->donau_pub),
+ &ds->donau_pub),
TALER_TESTING_make_trait_donau_sig (0,
- &ds->donau_sig),
+ &ds->donau_sig),
/* These traits are always available */
TALER_TESTING_make_trait_coin_priv (0,
coin_spent_priv),
diff --git a/src/testing/testing_api_cmd_deposits_get.c
b/src/testing/testing_api_cmd_deposits_get.c
index 97dc506..f3cd853 100644
--- a/src/testing/testing_api_cmd_deposits_get.c
+++ b/src/testing/testing_api_cmd_deposits_get.c
@@ -22,8 +22,8 @@
* @brief Implement the testing CMDs for the /deposits/ GET operations.
* @author Marcello Stanisci
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_testing_lib.h"
@@ -258,14 +258,14 @@ track_transaction_run (void *cls,
GNUNET_assert
( (GNUNET_OK ==
TALER_JSON_charity_wire_signature_hash (wire_details,
- &h_wire_details)) &&
+ &h_wire_details)) &&
(GNUNET_OK ==
TALER_JSON_contract_hash (contract_terms,
&h_contract_terms)) );
if (GNUNET_OK !=
TALER_TESTING_get_trait_charity_priv (transaction_cmd,
- &charity_priv))
+ &charity_priv))
{
GNUNET_break (0);
TALER_TESTING_interpreter_fail (tts->is);
diff --git a/src/testing/testing_api_cmd_get_donau.c
b/src/testing/testing_api_cmd_get_donau.c
index 8d08c61..ea8393b 100644
--- a/src/testing/testing_api_cmd_get_donau.c
+++ b/src/testing/testing_api_cmd_get_donau.c
@@ -21,8 +21,8 @@
* @brief Command to get an donau handle
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_testing_lib.h"
@@ -136,8 +136,8 @@ cert_cb (void *cls,
*/
static void
get_donau_run (void *cls,
- const struct TALER_TESTING_Command *cmd,
- struct TALER_TESTING_Interpreter *is)
+ const struct TALER_TESTING_Command *cmd,
+ struct TALER_TESTING_Interpreter *is)
{
struct GetDonauState *ges = cls;
struct DONAU_Keys *xkeys = NULL;
@@ -182,7 +182,7 @@ get_donau_run (void *cls,
}
if (GNUNET_OK !=
TALER_TESTING_get_trait_donau_url (state_cmd,
- &donau_url))
+ &donau_url))
{
GNUNET_break (0);
TALER_TESTING_interpreter_fail (is);
@@ -231,10 +231,10 @@ get_donau_run (void *cls,
ges->is = is;
ges->donau
= DONAU_get_keys (TALER_TESTING_interpreter_get_context (is),
- ges->donau_url,
- xkeys,
- &cert_cb,
- ges);
+ ges->donau_url,
+ xkeys,
+ &cert_cb,
+ ges);
DONAU_keys_decref (xkeys);
if (NULL == ges->donau)
{
@@ -255,7 +255,7 @@ get_donau_run (void *cls,
*/
static void
get_donau_cleanup (void *cls,
- const struct TALER_TESTING_Command *cmd)
+ const struct TALER_TESTING_Command *cmd)
{
struct GetDonauState *ges = cls;
@@ -283,9 +283,9 @@ get_donau_cleanup (void *cls,
*/
static enum GNUNET_GenericReturnValue
get_donau_traits (void *cls,
- const void **ret,
- const char *trait,
- unsigned int index)
+ const void **ret,
+ const char *trait,
+ unsigned int index)
{
struct GetDonauState *ges = cls;
unsigned int off = (NULL == ges->master_priv_file) ? 1 : 0;
diff --git a/src/testing/testing_api_cmd_insert_deposit.c
b/src/testing/testing_api_cmd_insert_deposit.c
index 11130d7..8691e41 100644
--- a/src/testing/testing_api_cmd_insert_deposit.c
+++ b/src/testing/testing_api_cmd_insert_deposit.c
@@ -22,13 +22,13 @@
* @author Marcello Stanisci
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include "taler_util.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_signatures.h"
#include "taler_testing_lib.h"
-#include "taler_donaudb_plugin.h"
+#include "donaudb_plugin.h"
#include "taler_donaudb_lib.h"
diff --git a/src/testing/testing_api_cmd_offline_sign_extensions.c
b/src/testing/testing_api_cmd_offline_sign_extensions.c
index fcbc637..353409f 100644
--- a/src/testing/testing_api_cmd_offline_sign_extensions.c
+++ b/src/testing/testing_api_cmd_offline_sign_extensions.c
@@ -22,8 +22,8 @@
* @brief run the taler-donau-offline command to sign extensions (and
therefore activate them)
* @author Özgür Kesim
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_signatures.h"
#include "taler_testing_lib.h"
diff --git a/src/testing/testing_api_cmd_offline_sign_global_fees.c
b/src/testing/testing_api_cmd_offline_sign_global_fees.c
index 129a23a..ee86c94 100644
--- a/src/testing/testing_api_cmd_offline_sign_global_fees.c
+++ b/src/testing/testing_api_cmd_offline_sign_global_fees.c
@@ -23,8 +23,8 @@
* @author Marcello Stanisci
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_signatures.h"
#include "taler_testing_lib.h"
diff --git a/src/testing/testing_api_cmd_offline_sign_keys.c
b/src/testing/testing_api_cmd_offline_sign_keys.c
index 028bf9a..967d9ca 100644
--- a/src/testing/testing_api_cmd_offline_sign_keys.c
+++ b/src/testing/testing_api_cmd_offline_sign_keys.c
@@ -23,8 +23,8 @@
* @author Marcello Stanisci
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_signatures.h"
#include "taler_testing_lib.h"
diff --git a/src/testing/testing_api_cmd_reserve_close.c
b/src/testing/testing_api_cmd_reserve_close.c
index fb6f26d..7436d98 100644
--- a/src/testing/testing_api_cmd_reserve_close.c
+++ b/src/testing/testing_api_cmd_reserve_close.c
@@ -21,8 +21,8 @@
* @brief Implement the /reserve/$RID/close test command.
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_testing_lib.h"
diff --git a/src/testing/testing_api_cmd_reserve_get.c
b/src/testing/testing_api_cmd_reserve_get.c
index 6ddaec5..988659a 100644
--- a/src/testing/testing_api_cmd_reserve_get.c
+++ b/src/testing/testing_api_cmd_reserve_get.c
@@ -21,8 +21,8 @@
* @brief Implement the GET /reserve/$RID test command.
* @author Marcello Stanisci
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_testing_lib.h"
diff --git a/src/testing/testing_api_cmd_reserve_history.c
b/src/testing/testing_api_cmd_reserve_history.c
index 557eaa6..cd75095 100644
--- a/src/testing/testing_api_cmd_reserve_history.c
+++ b/src/testing/testing_api_cmd_reserve_history.c
@@ -21,8 +21,8 @@
* @brief Implement the /reserve/history test command.
* @author Marcello Stanisci
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_testing_lib.h"
@@ -241,7 +241,7 @@ reserve_history_cb (void *cls,
keys = TALER_TESTING_get_keys (is);
GNUNET_assert (NULL != keys);
gf = DONAU_get_global_fee (keys,
- rs->ts);
+ rs->ts);
GNUNET_assert (NULL != gf);
ss->reserve_history.amount = gf->fees.history;
ss->reserve_history.details.history_details.request_timestamp = rs->ts;
diff --git a/src/testing/testing_api_cmd_reserve_open.c
b/src/testing/testing_api_cmd_reserve_open.c
index b1f4fec..b053e6e 100644
--- a/src/testing/testing_api_cmd_reserve_open.c
+++ b/src/testing/testing_api_cmd_reserve_open.c
@@ -21,8 +21,8 @@
* @brief Implement the /reserve/$RID/open test command.
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_testing_lib.h"
diff --git a/src/testing/testing_api_cmd_reserve_status.c
b/src/testing/testing_api_cmd_reserve_status.c
index 218894a..f7dcf5b 100644
--- a/src/testing/testing_api_cmd_reserve_status.c
+++ b/src/testing/testing_api_cmd_reserve_status.c
@@ -21,8 +21,8 @@
* @brief Implement the /reserve/$RID/status test command.
* @author Marcello Stanisci
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_testing_lib.h"
diff --git a/src/testing/testing_api_cmd_revoke.c
b/src/testing/testing_api_cmd_revoke.c
index 1e3e7d3..dd892cc 100644
--- a/src/testing/testing_api_cmd_revoke.c
+++ b/src/testing/testing_api_cmd_revoke.c
@@ -21,8 +21,8 @@
* @brief Implement the revoke test command.
* @author Marcello Stanisci
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_testing_lib.h"
diff --git a/src/testing/testing_api_cmd_revoke_denom_key.c
b/src/testing/testing_api_cmd_revoke_denom_key.c
index 3a0a23f..a4649e2 100644
--- a/src/testing/testing_api_cmd_revoke_denom_key.c
+++ b/src/testing/testing_api_cmd_revoke_denom_key.c
@@ -21,8 +21,8 @@
* @brief Implement the revoke test command.
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_signatures.h"
#include "taler_testing_lib.h"
@@ -158,7 +158,7 @@ revoke_run (void *cls,
const struct TALER_TESTING_Command *donau_cmd;
donau_cmd = TALER_TESTING_interpreter_get_command (is,
- "donau");
+ "donau");
if (NULL == donau_cmd)
{
GNUNET_break (0);
@@ -167,7 +167,7 @@ revoke_run (void *cls,
}
GNUNET_assert (GNUNET_OK ==
TALER_TESTING_get_trait_donau_url (donau_cmd,
- &donau_url));
+ &donau_url));
}
rs->is = is;
/* Get denom pub from trait */
@@ -199,7 +199,7 @@ revoke_run (void *cls,
const struct TALER_MasterPrivateKeyP *master_priv;
donau_cmd = TALER_TESTING_interpreter_get_command (is,
- "donau");
+ "donau");
if (NULL == donau_cmd)
{
GNUNET_break (0);
@@ -210,8 +210,8 @@ revoke_run (void *cls,
TALER_TESTING_get_trait_master_priv (donau_cmd,
&master_priv));
TALER_donau_offline_denomination_revoke_sign (&denom_pub->h_key,
- master_priv,
- &master_sig);
+ master_priv,
+ &master_sig);
}
rs->kh = DONAU_management_revoke_denomination_key (
TALER_TESTING_interpreter_get_context (is),
diff --git a/src/testing/testing_api_cmd_revoke_sign_key.c
b/src/testing/testing_api_cmd_revoke_sign_key.c
index a41b311..6693c55 100644
--- a/src/testing/testing_api_cmd_revoke_sign_key.c
+++ b/src/testing/testing_api_cmd_revoke_sign_key.c
@@ -21,8 +21,8 @@
* @brief Implement the revoke test command.
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_signatures.h"
#include "taler_testing_lib.h"
@@ -158,7 +158,7 @@ revoke_run (void *cls,
const struct TALER_TESTING_Command *donau_cmd;
donau_cmd = TALER_TESTING_interpreter_get_command (is,
- "donau");
+ "donau");
if (NULL == donau_cmd)
{
GNUNET_break (0);
@@ -167,7 +167,7 @@ revoke_run (void *cls,
}
GNUNET_assert (GNUNET_OK ==
TALER_TESTING_get_trait_donau_url (donau_cmd,
- &donau_url));
+ &donau_url));
}
rs->is = is;
/* Get sign pub from trait */
@@ -182,8 +182,8 @@ revoke_run (void *cls,
}
GNUNET_assert (GNUNET_OK ==
TALER_TESTING_get_trait_donau_pub (coin_cmd,
- 0,
- &donau_pub));
+ 0,
+ &donau_pub));
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Trying to revoke sign '%s..'\n",
TALER_B2S (donau_pub));
@@ -199,7 +199,7 @@ revoke_run (void *cls,
const struct TALER_MasterPrivateKeyP *master_priv;
donau_cmd = TALER_TESTING_interpreter_get_command (is,
- "donau");
+ "donau");
if (NULL == donau_cmd)
{
GNUNET_break (0);
@@ -210,8 +210,8 @@ revoke_run (void *cls,
TALER_TESTING_get_trait_master_priv (donau_cmd,
&master_priv));
TALER_donau_offline_signkey_revoke_sign (donau_pub,
- master_priv,
- &master_sig);
+ master_priv,
+ &master_sig);
}
rs->kh = DONAU_management_revoke_signing_key (
TALER_TESTING_interpreter_get_context (is),
diff --git a/src/testing/testing_api_cmd_stat.c
b/src/testing/testing_api_cmd_stat.c
index 1ad40b2..56a5d81 100644
--- a/src/testing/testing_api_cmd_stat.c
+++ b/src/testing/testing_api_cmd_stat.c
@@ -21,8 +21,8 @@
* @brief command(s) to get performance statistics on other commands
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_testing_lib.h"
diff --git a/src/testing/testing_api_cmd_transfer_get.c
b/src/testing/testing_api_cmd_transfer_get.c
index bd1bf29..2a4b969 100644
--- a/src/testing/testing_api_cmd_transfer_get.c
+++ b/src/testing/testing_api_cmd_transfer_get.c
@@ -22,8 +22,8 @@
* @brief Implement the testing CMDs for the /transfer GET operation.
* @author Marcello Stanisci
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_testing_lib.h"
diff --git a/src/testing/testing_api_cmd_wait.c
b/src/testing/testing_api_cmd_wait.c
index 74a3603..3aa3759 100644
--- a/src/testing/testing_api_cmd_wait.c
+++ b/src/testing/testing_api_cmd_wait.c
@@ -21,8 +21,8 @@
* @brief command(s) to wait on some process
* @author Christian Grothoff
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <gnunet/gnunet_curl_lib.h>
#include "taler_testing_lib.h"
diff --git a/src/testing/testing_api_cmd_withdraw.c
b/src/testing/testing_api_cmd_withdraw.c
index bc2f490..492a68c 100644
--- a/src/testing/testing_api_cmd_withdraw.c
+++ b/src/testing/testing_api_cmd_withdraw.c
@@ -22,12 +22,12 @@
* @author Christian Grothoff
* @author Marcello Stanisci
*/
-#include "platform.h"
-#include "taler_json_lib.h"
+#include "taler/platform.h"
+#include "taler/taler_json_lib.h"
#include <microhttpd.h>
#include <gnunet/gnunet_curl_lib.h>
#include "taler_signatures.h"
-#include "taler_extensions.h"
+#include "taler/taler_extensions.h"
#include "taler_testing_lib.h"
#include "backoff.h"
@@ -526,7 +526,7 @@ withdraw_traits (void *cls,
TALER_TESTING_make_trait_blinding_key (0 /* only one coin */,
&ws->bks),
TALER_TESTING_make_trait_donau_wd_value (0 /* only one coin */,
- &ws->donau_vals),
+ &ws->donau_vals),
TALER_TESTING_make_trait_denom_pub (0 /* only one coin */,
ws->pk),
TALER_TESTING_make_trait_denom_sig (0 /* only one coin */,
diff --git a/src/testing/testing_api_misc.c b/src/testing/testing_api_misc.c
index fbf488a..dda3895 100644
--- a/src/testing/testing_api_misc.c
+++ b/src/testing/testing_api_misc.c
@@ -21,7 +21,7 @@
* @brief non-command functions useful for writing tests
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "taler/platform.h"
#include <gnunet/gnunet_util_lib.h>
#include "taler_testing_lib.h"
#include "taler_fakebank_lib.h"
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-donau] branch master updated: [build] batch change includes related to taler with rule "includefile.h" -> "taler/includefile.h",
gnunet <=