diff options
Diffstat (limited to 'src/testing/testing_cmd_challenge_answer.c')
-rw-r--r-- | src/testing/testing_cmd_challenge_answer.c | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/src/testing/testing_cmd_challenge_answer.c b/src/testing/testing_cmd_challenge_answer.c index e6122e3..ec8d03d 100644 --- a/src/testing/testing_cmd_challenge_answer.c +++ b/src/testing/testing_cmd_challenge_answer.c @@ -259,7 +259,7 @@ challenge_answer_run (void *cls, struct TALER_TESTING_Interpreter *is) { struct ChallengeState *cs = cls; - const struct ANASTASIS_Challenge *c; + const struct ANASTASIS_Challenge **c; const struct ANASTASIS_PaymentSecretP *ps; cs->is = is; @@ -277,14 +277,15 @@ challenge_answer_run (void *cls, return; } if (GNUNET_OK != - ANASTASIS_TESTING_get_trait_challenge (ref, - cs->challenge_index, - &c)) + ANASTASIS_TESTING_get_trait_challenges (ref, + cs->challenge_index, + &c)) { GNUNET_break (0); TALER_TESTING_interpreter_fail (cs->is); return; } + cs->c = (struct ANASTASIS_Challenge *) *c; } if (NULL != cs->payment_ref) @@ -301,7 +302,6 @@ challenge_answer_run (void *cls, } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_payment_secret (ref, - 0, &ps)) { GNUNET_break (0); @@ -314,12 +314,10 @@ challenge_answer_run (void *cls, ps = NULL; } - cs->c = (struct ANASTASIS_Challenge *) c; - if (1 == cs->mode) { const struct TALER_TESTING_Command *ref; - const char *answer; + const char **answer; unsigned long long code; char dummy; @@ -333,7 +331,6 @@ challenge_answer_run (void *cls, } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_code (ref, - 0, &answer)) { GNUNET_break (0); @@ -341,7 +338,7 @@ challenge_answer_run (void *cls, return; } if (1 != - sscanf (answer, + sscanf (*answer, "%llu%c", &code, &dummy)) @@ -397,7 +394,7 @@ challenge_start_run (void *cls, struct TALER_TESTING_Interpreter *is) { struct ChallengeState *cs = cls; - const struct ANASTASIS_Challenge *c; + const struct ANASTASIS_Challenge **c; const struct TALER_TESTING_Command *ref; const struct ANASTASIS_PaymentSecretP *ps; @@ -412,9 +409,9 @@ challenge_start_run (void *cls, return; } if (GNUNET_OK != - ANASTASIS_TESTING_get_trait_challenge (ref, - cs->challenge_index, - &c)) + ANASTASIS_TESTING_get_trait_challenges (ref, + cs->challenge_index, + &c)) { GNUNET_break (0); TALER_TESTING_interpreter_fail (cs->is); @@ -434,7 +431,6 @@ challenge_start_run (void *cls, } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_payment_secret (ref, - 0, &ps)) { GNUNET_break (0); @@ -505,14 +501,14 @@ challenge_create_traits (void *cls, { struct ChallengeState *cs = cls; struct TALER_TESTING_Trait traits[] = { - ANASTASIS_TESTING_make_trait_code (0, - cs->code), - ANASTASIS_TESTING_make_trait_payment_secret (0, - &cs->payment_order_req), - TALER_TESTING_make_trait_url (TALER_TESTING_UT_TALER_URL, - cs->payment_uri), - TALER_TESTING_make_trait_order_id (0, - cs->order_id), + ANASTASIS_TESTING_make_trait_code ( + (const char **) cs->code), + ANASTASIS_TESTING_make_trait_payment_secret ( + &cs->payment_order_req), + TALER_TESTING_make_trait_payto_uri ( + (const char **) cs->payment_uri), + TALER_TESTING_make_trait_order_id ( + (const char **) &cs->order_id), TALER_TESTING_trait_end () }; |