diff options
Diffstat (limited to 'src/testing')
-rw-r--r-- | src/testing/test_bank_api.c | 20 | ||||
-rw-r--r-- | src/testing/testing_api_cmd_auditor_deposit_confirmation.c | 4 | ||||
-rw-r--r-- | src/testing/testing_api_cmd_deposit.c | 4 | ||||
-rw-r--r-- | src/testing/testing_api_cmd_deposits_get.c | 4 | ||||
-rw-r--r-- | src/testing/testing_api_cmd_refund.c | 4 |
5 files changed, 19 insertions, 17 deletions
diff --git a/src/testing/test_bank_api.c b/src/testing/test_bank_api.c index 3a3fd353b..46c2fa655 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 686624950..2d1ff9c24 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 613f981b5..76f0722de 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 d5617ec25..f2f3f0e39 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 e662ace2e..aeb597718 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 != |