summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-07-16 00:42:42 +0200
committerChristian Grothoff <christian@grothoff.org>2020-07-16 00:42:42 +0200
commit90e756ddea52715366fb5d9f7e3b4cced6be62e1 (patch)
tree3e1b69c63d5a4b3ec80a2ae301051c29d24a30b8
parent6ef6de6c5c13a8614d334e9e49233326b18c8025 (diff)
downloadexchange-90e756ddea52715366fb5d9f7e3b4cced6be62e1.tar.gz
exchange-90e756ddea52715366fb5d9f7e3b4cced6be62e1.tar.bz2
exchange-90e756ddea52715366fb5d9f7e3b4cced6be62e1.zip
rename TALER_JSON_hash to TALER_JSON_contract_hash
-rw-r--r--src/include/taler_json_lib.h4
-rw-r--r--src/json/json.c4
-rw-r--r--src/json/json_wire.c2
-rw-r--r--src/json/test_json_wire.c3
-rw-r--r--src/testing/test_bank_api.c20
-rw-r--r--src/testing/testing_api_cmd_auditor_deposit_confirmation.c4
-rw-r--r--src/testing/testing_api_cmd_deposit.c4
-rw-r--r--src/testing/testing_api_cmd_deposits_get.c4
-rw-r--r--src/testing/testing_api_cmd_refund.c4
9 files changed, 26 insertions, 23 deletions
diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h
index 5a16d40a..8550fd42 100644
--- a/src/include/taler_json_lib.h
+++ b/src/include/taler_json_lib.h
@@ -155,8 +155,8 @@ TALER_JSON_spec_denomination_signature (const char *field,
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
int
-TALER_JSON_hash (const json_t *json,
- struct GNUNET_HashCode *hc);
+TALER_JSON_contract_hash (const json_t *json,
+ struct GNUNET_HashCode *hc);
/**
* Extract the Taler error code from the given @a json object.
diff --git a/src/json/json.c b/src/json/json.c
index 67d62605..a1a2c6fb 100644
--- a/src/json/json.c
+++ b/src/json/json.c
@@ -38,8 +38,8 @@
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
int
-TALER_JSON_hash (const json_t *json,
- struct GNUNET_HashCode *hc)
+TALER_JSON_contract_hash (const json_t *json,
+ struct GNUNET_HashCode *hc)
{
char *wire_enc;
size_t len;
diff --git a/src/json/json_wire.c b/src/json/json_wire.c
index 7d3453e1..78bb1b41 100644
--- a/src/json/json_wire.c
+++ b/src/json/json_wire.c
@@ -343,7 +343,7 @@ validate_payto_iban (const char *account_url)
IBAN_PREFIX,
strlen (IBAN_PREFIX)))
return GNUNET_NO;
-
+
iban = strrchr (account_url, '/') + 1;
#undef IBAN_PREFIX
q = strchr (iban,
diff --git a/src/json/test_json_wire.c b/src/json/test_json_wire.c
index 75208c40..f9264c61 100644
--- a/src/json/test_json_wire.c
+++ b/src/json/test_json_wire.c
@@ -33,7 +33,8 @@ main (int argc,
json_t *wire_xtalerbank;
json_t *wire_iban;
const char *payto_xtalerbank = "payto://x-taler-bank/42";
- const char *payto_iban = "payto://iban/BIC-TO-BE-SKIPPED/DE89370400440532013000";
+ const char *payto_iban =
+ "payto://iban/BIC-TO-BE-SKIPPED/DE89370400440532013000";
char *p_xtalerbank;
char *p_iban;
diff --git a/src/testing/test_bank_api.c b/src/testing/test_bank_api.c
index 3a3fd353..46c2fa65 100644
--- a/src/testing/test_bank_api.c
+++ b/src/testing/test_bank_api.c
@@ -88,7 +88,7 @@ run (void *cls,
&bc.exchange_auth,
bc.user42_payto),
TALER_TESTING_cmd_sleep ("Waiting 4s for 'credit-1' to settle",
- 4),
+ 4),
TALER_TESTING_cmd_bank_credits ("history-1c",
&bc.exchange_auth,
NULL,
@@ -110,7 +110,7 @@ run (void *cls,
"http://exchange.example.com/"),
TALER_TESTING_cmd_sleep ("Waiting 5s for 'debit-1' to settle",
- 5),
+ 5),
TALER_TESTING_cmd_bank_debits ("history-2b",
&bc.exchange_auth,
NULL,
@@ -203,8 +203,9 @@ main (int argc,
GNUNET_break (0);
return 77;
}
- } else if (GNUNET_YES == TALER_TESTING_has_in_name (argv[0],
- "_with_nexus"))
+ }
+ else if (GNUNET_YES == TALER_TESTING_has_in_name (argv[0],
+ "_with_nexus"))
{
TALER_LOG_DEBUG ("Running with Nexus.\n");
with_libeufin = GNUNET_YES;
@@ -218,7 +219,8 @@ main (int argc,
return 77;
}
libeufin_services = TALER_TESTING_run_libeufin (&bc);
- if ( (NULL == libeufin_services.nexus) || (NULL == libeufin_services.sandbox) )
+ if ( (NULL == libeufin_services.nexus) || (NULL ==
+ libeufin_services.sandbox) )
{
GNUNET_break (0);
return 77;
@@ -242,7 +244,7 @@ main (int argc,
if (GNUNET_NO == with_fakebank)
{
// -> pybank
- if (GNUNET_NO == with_libeufin)
+ if (GNUNET_NO == with_libeufin)
{
GNUNET_OS_process_kill (bankd,
@@ -255,13 +257,13 @@ main (int argc,
GNUNET_OS_process_kill (libeufin_services.nexus,
SIGKILL);
GNUNET_OS_process_wait (libeufin_services.nexus);
- GNUNET_OS_process_destroy (libeufin_services.nexus);
+ GNUNET_OS_process_destroy (libeufin_services.nexus);
GNUNET_OS_process_kill (libeufin_services.sandbox,
SIGKILL);
GNUNET_OS_process_wait (libeufin_services.sandbox);
- GNUNET_OS_process_destroy (libeufin_services.sandbox);
- }
+ GNUNET_OS_process_destroy (libeufin_services.sandbox);
+ }
}
return rv;
diff --git a/src/testing/testing_api_cmd_auditor_deposit_confirmation.c b/src/testing/testing_api_cmd_auditor_deposit_confirmation.c
index 68662495..2d1ff9c2 100644
--- a/src/testing/testing_api_cmd_auditor_deposit_confirmation.c
+++ b/src/testing/testing_api_cmd_auditor_deposit_confirmation.c
@@ -256,8 +256,8 @@ deposit_confirmation_run (void *cls,
/* Very unlikely to fail */
GNUNET_assert (NULL != contract_terms);
GNUNET_assert (GNUNET_OK ==
- TALER_JSON_hash (contract_terms,
- &h_contract_terms));
+ TALER_JSON_contract_hash (contract_terms,
+ &h_contract_terms));
GNUNET_assert (GNUNET_OK ==
TALER_TESTING_get_trait_wire_details (deposit_cmd,
dcs->coin_index,
diff --git a/src/testing/testing_api_cmd_deposit.c b/src/testing/testing_api_cmd_deposit.c
index 613f981b..76f0722d 100644
--- a/src/testing/testing_api_cmd_deposit.c
+++ b/src/testing/testing_api_cmd_deposit.c
@@ -372,8 +372,8 @@ deposit_run (void *cls,
ds->coin_index,
&denom_pub_sig)) ||
(GNUNET_OK !=
- TALER_JSON_hash (ds->contract_terms,
- &h_contract_terms)) )
+ TALER_JSON_contract_hash (ds->contract_terms,
+ &h_contract_terms)) )
{
GNUNET_break (0);
TALER_TESTING_interpreter_fail (is);
diff --git a/src/testing/testing_api_cmd_deposits_get.c b/src/testing/testing_api_cmd_deposits_get.c
index d5617ec2..f2f3f0e3 100644
--- a/src/testing/testing_api_cmd_deposits_get.c
+++ b/src/testing/testing_api_cmd_deposits_get.c
@@ -246,8 +246,8 @@ track_transaction_run (void *cls,
TALER_JSON_merchant_wire_signature_hash (wire_details,
&h_wire_details)) &&
(GNUNET_OK ==
- TALER_JSON_hash (contract_terms,
- &h_contract_terms)) );
+ TALER_JSON_contract_hash (contract_terms,
+ &h_contract_terms)) );
if (GNUNET_OK !=
TALER_TESTING_get_trait_merchant_priv (transaction_cmd,
diff --git a/src/testing/testing_api_cmd_refund.c b/src/testing/testing_api_cmd_refund.c
index e662ace2..aeb59771 100644
--- a/src/testing/testing_api_cmd_refund.c
+++ b/src/testing/testing_api_cmd_refund.c
@@ -168,8 +168,8 @@ refund_run (void *cls,
return;
}
GNUNET_assert (GNUNET_OK ==
- TALER_JSON_hash (contract_terms,
- &h_contract_terms));
+ TALER_JSON_contract_hash (contract_terms,
+ &h_contract_terms));
/* Hunting for a coin .. */
if (GNUNET_OK !=