summaryrefslogtreecommitdiff
path: root/src/testing
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2022-02-21 00:25:06 +0100
committerChristian Grothoff <christian@grothoff.org>2022-02-21 00:25:31 +0100
commit7d9f4347829af7f39393f5808a1f8d6bbea89a51 (patch)
tree1d15a0e4b4771d3c461c5fc9a7c296faf2e8bb81 /src/testing
parent98fab354308e6b26c931dbdbeb68463a9c4cdadd (diff)
downloadmerchant-7d9f4347829af7f39393f5808a1f8d6bbea89a51.tar.gz
merchant-7d9f4347829af7f39393f5808a1f8d6bbea89a51.tar.bz2
merchant-7d9f4347829af7f39393f5808a1f8d6bbea89a51.zip
-big renaming of structs for consistent naming with P suffix
Diffstat (limited to 'src/testing')
-rw-r--r--src/testing/testing_api_cmd_abort_order.c2
-rw-r--r--src/testing/testing_api_cmd_claim_order.c4
-rw-r--r--src/testing/testing_api_cmd_kyc_get.c2
-rw-r--r--src/testing/testing_api_cmd_merchant_get_order.c2
-rw-r--r--src/testing/testing_api_cmd_pay_order.c6
-rw-r--r--src/testing/testing_api_cmd_post_orders.c4
-rw-r--r--src/testing/testing_api_cmd_post_orders_paid.c2
-rw-r--r--src/testing/testing_api_cmd_refund_order.c2
-rw-r--r--src/testing/testing_api_cmd_wallet_get_order.c4
-rw-r--r--src/testing/testing_api_cmd_wallet_post_orders_refund.c2
10 files changed, 15 insertions, 15 deletions
diff --git a/src/testing/testing_api_cmd_abort_order.c b/src/testing/testing_api_cmd_abort_order.c
index d2e2d357..9c41d53e 100644
--- a/src/testing/testing_api_cmd_abort_order.c
+++ b/src/testing/testing_api_cmd_abort_order.c
@@ -230,7 +230,7 @@ abort_run (void *cls,
const char **coin_reference;
const struct TALER_TESTING_Command *proposal_cmd;
const char *order_id;
- const struct TALER_PrivateContractHash *h_proposal;
+ const struct TALER_PrivateContractHashP *h_proposal;
struct TALER_MerchantPublicKeyP merchant_pub;
struct TALER_Amount total_amount;
const char *error_name;
diff --git a/src/testing/testing_api_cmd_claim_order.c b/src/testing/testing_api_cmd_claim_order.c
index b2c8c6c5..d7a3ec41 100644
--- a/src/testing/testing_api_cmd_claim_order.c
+++ b/src/testing/testing_api_cmd_claim_order.c
@@ -52,7 +52,7 @@ struct OrderClaimState
/**
* Hash over the contract terms. Only set if we got #MHD_HTTP_OK.
*/
- struct TALER_PrivateContractHash contract_terms_hash;
+ struct TALER_PrivateContractHashP contract_terms_hash;
/**
* Signature of the merchant. Only set if we got #MHD_HTTP_OK.
@@ -135,7 +135,7 @@ order_claim_cb (void *cls,
const struct TALER_MERCHANT_HttpResponse *hr,
const json_t *contract_terms,
const struct TALER_MerchantSignatureP *sig,
- const struct TALER_PrivateContractHash *hash)
+ const struct TALER_PrivateContractHashP *hash)
{
struct OrderClaimState *pls = cls;
diff --git a/src/testing/testing_api_cmd_kyc_get.c b/src/testing/testing_api_cmd_kyc_get.c
index 07fe84e1..b2912401 100644
--- a/src/testing/testing_api_cmd_kyc_get.c
+++ b/src/testing/testing_api_cmd_kyc_get.c
@@ -195,7 +195,7 @@ kyc_get_run (void *cls,
struct TALER_TESTING_Interpreter *is)
{
struct KycGetState *cs = cls;
- const struct TALER_MerchantWireHash *h_wire = NULL;
+ const struct TALER_MerchantWireHashP *h_wire = NULL;
cs->is = is;
if (NULL != cs->h_wire_ref)
diff --git a/src/testing/testing_api_cmd_merchant_get_order.c b/src/testing/testing_api_cmd_merchant_get_order.c
index 1977f792..85ba174f 100644
--- a/src/testing/testing_api_cmd_merchant_get_order.c
+++ b/src/testing/testing_api_cmd_merchant_get_order.c
@@ -568,7 +568,7 @@ merchant_get_order_run (void *cls,
struct MerchantGetOrderState *gos = cls;
const struct TALER_TESTING_Command *order_cmd;
const char **order_id;
- const struct TALER_PrivateContractHash *h_contract;
+ const struct TALER_PrivateContractHashP *h_contract;
order_cmd = TALER_TESTING_interpreter_lookup_command (
is,
diff --git a/src/testing/testing_api_cmd_pay_order.c b/src/testing/testing_api_cmd_pay_order.c
index 956a54ef..dbc8d6da 100644
--- a/src/testing/testing_api_cmd_pay_order.c
+++ b/src/testing/testing_api_cmd_pay_order.c
@@ -38,7 +38,7 @@ struct PayState
/**
* Contract terms hash code.
*/
- struct TALER_PrivateContractHash h_contract_terms;
+ struct TALER_PrivateContractHashP h_contract_terms;
/**
* The interpreter state.
@@ -261,8 +261,8 @@ pay_run (void *cls,
struct GNUNET_TIME_Timestamp pay_deadline;
struct GNUNET_TIME_Timestamp timestamp;
struct TALER_MerchantPublicKeyP merchant_pub;
- struct TALER_MerchantWireHash h_wire;
- const struct TALER_PrivateContractHash *h_proposal;
+ struct TALER_MerchantWireHashP h_wire;
+ const struct TALER_PrivateContractHashP *h_proposal;
struct TALER_Amount total_amount;
struct TALER_Amount max_fee;
const char *error_name;
diff --git a/src/testing/testing_api_cmd_post_orders.c b/src/testing/testing_api_cmd_post_orders.c
index bb31dacc..b3f15fc8 100644
--- a/src/testing/testing_api_cmd_post_orders.c
+++ b/src/testing/testing_api_cmd_post_orders.c
@@ -63,7 +63,7 @@ struct OrdersState
/**
* Contract terms hash code.
*/
- struct TALER_PrivateContractHash h_contract_terms;
+ struct TALER_PrivateContractHashP h_contract_terms;
/**
* The /orders operation handle.
@@ -191,7 +191,7 @@ orders_claim_cb (void *cls,
const struct TALER_MERCHANT_HttpResponse *hr,
const json_t *contract_terms,
const struct TALER_MerchantSignatureP *sig,
- const struct TALER_PrivateContractHash *hash)
+ const struct TALER_PrivateContractHashP *hash)
{
struct OrdersState *ps = cls;
struct TALER_MerchantPublicKeyP merchant_pub;
diff --git a/src/testing/testing_api_cmd_post_orders_paid.c b/src/testing/testing_api_cmd_post_orders_paid.c
index 2050478f..6c4e41cd 100644
--- a/src/testing/testing_api_cmd_post_orders_paid.c
+++ b/src/testing/testing_api_cmd_post_orders_paid.c
@@ -113,7 +113,7 @@ paid_run (void *cls,
const char **proposal_reference;
const struct TALER_TESTING_Command *proposal_cmd;
const char *order_id;
- const struct TALER_PrivateContractHash *h_contract_terms;
+ const struct TALER_PrivateContractHashP *h_contract_terms;
const struct TALER_MerchantSignatureP *merchant_sig;
ops->is = is;
diff --git a/src/testing/testing_api_cmd_refund_order.c b/src/testing/testing_api_cmd_refund_order.c
index 15154149..0f94622c 100644
--- a/src/testing/testing_api_cmd_refund_order.c
+++ b/src/testing/testing_api_cmd_refund_order.c
@@ -85,7 +85,7 @@ static void
refund_cb (void *cls,
const struct TALER_MERCHANT_HttpResponse *hr,
const char *taler_refund_uri,
- const struct TALER_PrivateContractHash *h_contract)
+ const struct TALER_PrivateContractHashP *h_contract)
{
struct RefundState *ris = cls;
diff --git a/src/testing/testing_api_cmd_wallet_get_order.c b/src/testing/testing_api_cmd_wallet_get_order.c
index faa0a77d..f9e89d63 100644
--- a/src/testing/testing_api_cmd_wallet_get_order.c
+++ b/src/testing/testing_api_cmd_wallet_get_order.c
@@ -266,7 +266,7 @@ wallet_get_order_run (void *cls,
struct WalletGetOrderState *gos = cls;
const struct TALER_TESTING_Command *order_cmd;
const char **order_id;
- const struct TALER_PrivateContractHash *h_contract;
+ const struct TALER_PrivateContractHashP *h_contract;
order_cmd = TALER_TESTING_interpreter_lookup_command (
is,
@@ -640,7 +640,7 @@ wallet_poll_order_start_run (void *cls,
struct WalletPollOrderStartState *pos = cls;
const struct TALER_TESTING_Command *order_cmd;
const char **order_id;
- const struct TALER_PrivateContractHash *h_contract;
+ const struct TALER_PrivateContractHashP *h_contract;
order_cmd = TALER_TESTING_interpreter_lookup_command (
is,
diff --git a/src/testing/testing_api_cmd_wallet_post_orders_refund.c b/src/testing/testing_api_cmd_wallet_post_orders_refund.c
index b138b327..b9e7981f 100644
--- a/src/testing/testing_api_cmd_wallet_post_orders_refund.c
+++ b/src/testing/testing_api_cmd_wallet_post_orders_refund.c
@@ -173,7 +173,7 @@ obtain_refunds_run (void *cls,
const struct TALER_TESTING_Command *proposal_cmd =
TALER_TESTING_interpreter_lookup_command (is,
wrs->proposal_reference);
- const struct TALER_PrivateContractHash *h_contract_terms;
+ const struct TALER_PrivateContractHashP *h_contract_terms;
const char *order_id;
if (NULL == proposal_cmd)