diff options
Diffstat (limited to 'src/testing/testing_api_cmd_wire_add.c')
-rw-r--r-- | src/testing/testing_api_cmd_wire_add.c | 56 |
1 files changed, 38 insertions, 18 deletions
diff --git a/src/testing/testing_api_cmd_wire_add.c b/src/testing/testing_api_cmd_wire_add.c index c36f03b15..b19cca1e0 100644 --- a/src/testing/testing_api_cmd_wire_add.c +++ b/src/testing/testing_api_cmd_wire_add.c @@ -79,16 +79,8 @@ wire_add_cb (void *cls, ds->dh = NULL; if (ds->expected_response_code != hr->http_status) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Unexpected response code %u to command %s in %s:%u\n", - hr->http_status, - ds->is->commands[ds->is->ip].label, - __FILE__, - __LINE__); - json_dumpf (hr->reply, - stderr, - 0); - TALER_TESTING_interpreter_fail (ds->is); + TALER_TESTING_unexpected_status (ds->is, + hr->http_status); return; } TALER_TESTING_interpreter_next (ds->is); @@ -113,8 +105,24 @@ wire_add_run (void *cls, struct GNUNET_TIME_Timestamp now; json_t *credit_rest; json_t *debit_rest; + const char *exchange_url; (void) cmd; + { + const struct TALER_TESTING_Command *exchange_cmd; + + exchange_cmd = TALER_TESTING_interpreter_get_command (is, + "exchange"); + if (NULL == exchange_cmd) + { + GNUNET_break (0); + TALER_TESTING_interpreter_fail (is); + return; + } + GNUNET_assert (GNUNET_OK == + TALER_TESTING_get_trait_exchange_url (exchange_cmd, + &exchange_url)); + } now = GNUNET_TIME_timestamp_get (); ds->is = is; debit_rest = json_array (); @@ -130,23 +138,37 @@ wire_add_run (void *cls, } else { + const struct TALER_TESTING_Command *exchange_cmd; + const struct TALER_MasterPrivateKeyP *master_priv; + + exchange_cmd = TALER_TESTING_interpreter_get_command (is, + "exchange"); + if (NULL == exchange_cmd) + { + GNUNET_break (0); + TALER_TESTING_interpreter_fail (is); + return; + } + GNUNET_assert (GNUNET_OK == + TALER_TESTING_get_trait_master_priv (exchange_cmd, + &master_priv)); TALER_exchange_offline_wire_add_sign (ds->payto_uri, NULL, debit_rest, credit_rest, now, - &is->master_priv, + master_priv, &master_sig1); TALER_exchange_wire_signature_make (ds->payto_uri, NULL, debit_rest, credit_rest, - &is->master_priv, + master_priv, &master_sig2); } ds->dh = TALER_EXCHANGE_management_enable_wire ( - is->ctx, - is->exchange_url, + TALER_TESTING_interpreter_get_context (is), + exchange_url, ds->payto_uri, NULL, debit_rest, @@ -182,10 +204,8 @@ wire_add_cleanup (void *cls, if (NULL != ds->dh) { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Command %u (%s) did not complete\n", - ds->is->ip, - cmd->label); + TALER_TESTING_command_incomplete (ds->is, + cmd->label); TALER_EXCHANGE_management_enable_wire_cancel (ds->dh); ds->dh = NULL; } |