taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename TALER_JSON_hash to TALER_JSON_contract_hash

Browse Source
This commit is contained in:
Christian Grothoff 2020-07-16 00:42:42 +02:00
parent 6ef6de6c5c
commit 90e756ddea
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
9 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/taler_json_lib.h
View File

@ -155,7 +155,7 @@ TALER_JSON_spec_denomination_signature (const char *field,
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/ */
int int
TALER_JSON_hash (const json_t *json, TALER_JSON_contract_hash (const json_t *json,
struct GNUNET_HashCode *hc); struct GNUNET_HashCode *hc);
/** /**

2
src/json/json.c
View File

@ -38,7 +38,7 @@
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/ */
int int
TALER_JSON_hash (const json_t *json, TALER_JSON_contract_hash (const json_t *json,
struct GNUNET_HashCode *hc) struct GNUNET_HashCode *hc)
{ {
char *wire_enc; char *wire_enc;

3
src/json/test_json_wire.c
View File

@ -33,7 +33,8 @@ main (int argc,
json_t *wire_xtalerbank; json_t *wire_xtalerbank;
json_t *wire_iban; json_t *wire_iban;
const char *payto_xtalerbank = "payto://x-taler-bank/42"; 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_xtalerbank;
char *p_iban; char *p_iban;

6
src/testing/test_bank_api.c
View File

@ -203,7 +203,8 @@ main (int argc,
GNUNET_break (0); GNUNET_break (0);
return 77; return 77;
} }
} else if (GNUNET_YES == TALER_TESTING_has_in_name (argv[0], }
else if (GNUNET_YES == TALER_TESTING_has_in_name (argv[0],
"_with_nexus")) "_with_nexus"))
{ {
TALER_LOG_DEBUG ("Running with Nexus.\n"); TALER_LOG_DEBUG ("Running with Nexus.\n");
@ -218,7 +219,8 @@ main (int argc,
return 77; return 77;
} }
libeufin_services = TALER_TESTING_run_libeufin (&bc); 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); GNUNET_break (0);
return 77; return 77;

2
src/testing/testing_api_cmd_auditor_deposit_confirmation.c
View File

@ -256,7 +256,7 @@ deposit_confirmation_run (void *cls,
/* Very unlikely to fail */ /* Very unlikely to fail */
GNUNET_assert (NULL != contract_terms); GNUNET_assert (NULL != contract_terms);
GNUNET_assert (GNUNET_OK == GNUNET_assert (GNUNET_OK ==
TALER_JSON_hash (contract_terms, TALER_JSON_contract_hash (contract_terms,
&h_contract_terms)); &h_contract_terms));
GNUNET_assert (GNUNET_OK == GNUNET_assert (GNUNET_OK ==
TALER_TESTING_get_trait_wire_details (deposit_cmd, TALER_TESTING_get_trait_wire_details (deposit_cmd,

2
src/testing/testing_api_cmd_deposit.c
View File

@ -372,7 +372,7 @@ deposit_run (void *cls,
ds->coin_index, ds->coin_index,
&denom_pub_sig)) || &denom_pub_sig)) ||
(GNUNET_OK != (GNUNET_OK !=
TALER_JSON_hash (ds->contract_terms, TALER_JSON_contract_hash (ds->contract_terms,
&h_contract_terms)) ) &h_contract_terms)) )
{ {
GNUNET_break (0); GNUNET_break (0);

2
src/testing/testing_api_cmd_deposits_get.c
View File

@ -246,7 +246,7 @@ track_transaction_run (void *cls,
TALER_JSON_merchant_wire_signature_hash (wire_details, TALER_JSON_merchant_wire_signature_hash (wire_details,
&h_wire_details)) && &h_wire_details)) &&
(GNUNET_OK == (GNUNET_OK ==
TALER_JSON_hash (contract_terms, TALER_JSON_contract_hash (contract_terms,
&h_contract_terms)) ); &h_contract_terms)) );
if (GNUNET_OK != if (GNUNET_OK !=

2
src/testing/testing_api_cmd_refund.c
View File

@ -168,7 +168,7 @@ refund_run (void *cls,
return; return;
} }
GNUNET_assert (GNUNET_OK == GNUNET_assert (GNUNET_OK ==
TALER_JSON_hash (contract_terms, TALER_JSON_contract_hash (contract_terms,
&h_contract_terms)); &h_contract_terms));
/* Hunting for a coin .. */ /* Hunting for a coin .. */