From 9f0245ca991b6284f474cca9c0e466f0eec5d738 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 4 May 2016 05:16:32 +0200 Subject: modify test to trigger aggregation properly and check resulting fakebank transfers --- src/exchange-lib/test_exchange_api.c | 104 +++++++++++++++++++++++++++++++++-- 1 file changed, 98 insertions(+), 6 deletions(-) (limited to 'src/exchange-lib/test_exchange_api.c') diff --git a/src/exchange-lib/test_exchange_api.c b/src/exchange-lib/test_exchange_api.c index b20f7706..af2aaf6d 100644 --- a/src/exchange-lib/test_exchange_api.c +++ b/src/exchange-lib/test_exchange_api.c @@ -624,6 +624,18 @@ struct InterpreterState }; +/** + * Pipe used to communicate child death via signal. + */ +static struct GNUNET_DISK_PipeHandle *sigpipe; + +/** + * ID of task called whenever we get a SIGCHILD. + */ +static struct GNUNET_SCHEDULER_Task *child_death_task; + + + /** * The testcase failed, return with an error code. * @@ -1184,6 +1196,30 @@ link_cb (void *cls, } +/** + * Task triggered whenever we receive a SIGCHLD (child + * process died). + * + * @param cls closure, NULL if we need to self-restart + */ +static void +maint_child_death (void *cls) +{ + struct InterpreterState *is = cls; + struct Command *cmd = &is->commands[is->ip]; + const struct GNUNET_DISK_FileHandle *pr; + char c[16]; + + child_death_task = NULL; + pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ); + GNUNET_break (0 < GNUNET_DISK_file_read (pr, &c, sizeof (c))); + GNUNET_OS_process_wait (cmd->details.run_aggregator.aggregator_proc); + GNUNET_OS_process_destroy (cmd->details.run_aggregator.aggregator_proc); + cmd->details.run_aggregator.aggregator_proc = NULL; + next_command (is); +} + + /** * Find denomination key matching the given amount. * @@ -1698,7 +1734,7 @@ interpreter_run (void *cls) GNUNET_CRYPTO_eddsa_key_get_public (&cmd->details.deposit.merchant_priv.eddsa_priv, &merchant_pub.eddsa_pub); - wire_deadline = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_DAYS); + wire_deadline = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_ZERO); timestamp = GNUNET_TIME_absolute_get (); GNUNET_TIME_round_abs (×tamp); { @@ -1999,6 +2035,8 @@ interpreter_run (void *cls) return; case OC_RUN_AGGREGATOR: { + const struct GNUNET_DISK_FileHandle *pr; + cmd->details.run_aggregator.aggregator_proc = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, @@ -2014,10 +2052,10 @@ interpreter_run (void *cls) fail (is); return; } - GNUNET_OS_process_wait (cmd->details.run_aggregator.aggregator_proc); - GNUNET_OS_process_destroy (cmd->details.run_aggregator.aggregator_proc); - cmd->details.run_aggregator.aggregator_proc = NULL; - next_command (is); + pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ); + child_death_task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, + pr, + &maint_child_death, is); return; } case OC_CHECK_BANK_DEPOSIT: @@ -2071,6 +2109,24 @@ interpreter_run (void *cls) } +/** + * Signal handler called for SIGCHLD. Triggers the + * respective handler by writing to the trigger pipe. + */ +static void +sighandler_child_death () +{ + static char c; + int old_errno = errno; /* back-up errno */ + + GNUNET_break (1 == + GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle + (sigpipe, GNUNET_DISK_PIPE_END_WRITE), + &c, sizeof (c))); + errno = old_errno; /* restore errno */ +} + + /** * Function run when the test terminates (good or bad) with timeout. * @@ -2526,7 +2582,7 @@ run (void *cls) .details.deposit.amount = "EUR:0.1", .details.deposit.coin_ref = "refresh-reveal-1", .details.deposit.coin_idx = 4, - .details.deposit.wire_details = "{ \"type\":\"test\", \"bank_uri\":\"http://localhost:8082/\", \"account_number\":42 }", + .details.deposit.wire_details = "{ \"type\":\"test\", \"bank_uri\":\"http://localhost:8082/\", \"account_number\":43 }", .details.deposit.contract = "{ \"items\": [ { \"name\":\"ice cream\", \"value\":3 } ] }", .details.deposit.transaction_id = 2 }, @@ -2563,9 +2619,37 @@ run (void *cls) .label = "wire-deposit-failing", .expected_response_code = MHD_HTTP_NOT_FOUND }, + /* Run transfers. Note that _actual_ aggregation will NOT + happen here, as each deposit operation is run with a + fresh merchant public key! */ { .oc = OC_RUN_AGGREGATOR, .label = "run-aggregator" }, + { .oc = OC_CHECK_BANK_DEPOSIT, + .label = "check_bank_deposit-499c", + .details.check_bank_deposit.amount = "EUR:4.99", + .details.check_bank_deposit.account_debit = 2, + .details.check_bank_deposit.account_credit = 42 + }, + { .oc = OC_CHECK_BANK_DEPOSIT, + .label = "check_bank_deposit-99c1", + .details.check_bank_deposit.amount = "EUR:0.99", + .details.check_bank_deposit.account_debit = 2, + .details.check_bank_deposit.account_credit = 42 + }, + { .oc = OC_CHECK_BANK_DEPOSIT, + .label = "check_bank_deposit-99c2", + .details.check_bank_deposit.amount = "EUR:0.99", + .details.check_bank_deposit.account_debit = 2, + .details.check_bank_deposit.account_credit = 42 + }, + { .oc = OC_CHECK_BANK_DEPOSIT, + .label = "check_bank_deposit-9c", + .details.check_bank_deposit.amount = "EUR:0.09", + .details.check_bank_deposit.account_debit = 2, + .details.check_bank_deposit.account_credit = 43 + }, + { .oc = OC_CHECK_BANK_DEPOSITS_EMPTY, .label = "check_bank_empty" }, @@ -2613,6 +2697,7 @@ main (int argc, { struct GNUNET_OS_Process *proc; struct GNUNET_OS_Process *exchanged; + struct GNUNET_SIGNAL_Context *shc_chld; GNUNET_log_setup ("test-exchange-api", "WARNING", @@ -2646,7 +2731,14 @@ main (int argc, while (0 != system ("wget -q -t 1 -T 1 http://127.0.0.1:8081/keys -o /dev/null -O /dev/null")); fprintf (stderr, "\n"); result = GNUNET_SYSERR; + sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO, GNUNET_NO); + GNUNET_assert (NULL != sigpipe); + shc_chld = GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, + &sighandler_child_death); GNUNET_SCHEDULER_run (&run, NULL); + GNUNET_SIGNAL_handler_uninstall (shc_chld); + shc_chld = NULL; + GNUNET_DISK_pipe_close (sigpipe); GNUNET_OS_process_kill (exchanged, SIGTERM); GNUNET_OS_process_wait (exchanged); -- cgit v1.2.3 From 27300ad1ccb56ad1f83cb3769f64dae21f5a0b85 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 4 May 2016 05:19:47 +0200 Subject: round exec time --- src/exchange-lib/test_exchange_api.c | 6 ++++++ src/exchange/taler-exchange-aggregator.c | 1 + 2 files changed, 7 insertions(+) (limited to 'src/exchange-lib/test_exchange_api.c') diff --git a/src/exchange-lib/test_exchange_api.c b/src/exchange-lib/test_exchange_api.c index af2aaf6d..0a82bac1 100644 --- a/src/exchange-lib/test_exchange_api.c +++ b/src/exchange-lib/test_exchange_api.c @@ -2653,6 +2653,12 @@ run (void *cls) { .oc = OC_CHECK_BANK_DEPOSITS_EMPTY, .label = "check_bank_empty" }, + { .oc = OC_DEPOSIT_WTID, + .label = "deposit-wtid-ok", + .expected_response_code = MHD_HTTP_OK, + .details.deposit_wtid.deposit_ref = "deposit-simple" }, + + /* TODO: trigger aggregation logic and then check the cases where tracking succeeds! */ diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c index aeafd60f..7d9390ab 100644 --- a/src/exchange/taler-exchange-aggregator.c +++ b/src/exchange/taler-exchange-aggregator.c @@ -434,6 +434,7 @@ deposit_cb (void *cls, au->row_id = row_id; au->wire = (json_t *) wire; au->execution_time = GNUNET_TIME_absolute_get (); + (void) GNUNET_TIME_round_abs (&au->execution_time); TALER_JSON_hash (au->wire, &au->h_wire); json_incref (au->wire); -- cgit v1.2.3 From 2c832199b2e20db5f98161b7bb6b06d94c74268f Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 4 May 2016 05:36:23 +0200 Subject: check WTID matches --- src/exchange-lib/test_exchange_api.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'src/exchange-lib/test_exchange_api.c') diff --git a/src/exchange-lib/test_exchange_api.c b/src/exchange-lib/test_exchange_api.c index 0a82bac1..6a49b4ad 100644 --- a/src/exchange-lib/test_exchange_api.c +++ b/src/exchange-lib/test_exchange_api.c @@ -544,6 +544,11 @@ struct Command */ const char *deposit_ref; + /** + * Which #OC_CHECK_BANK_DEPOSIT wtid should this match? NULL for none. + */ + const char *bank_transfer_ref; + /** * What is the expected total amount? Only used if * @e expected_response_code was #MHD_HTTP_OK. @@ -1457,6 +1462,22 @@ deposit_wtid_cb (void *cls, { case MHD_HTTP_OK: cmd->details.deposit_wtid.wtid = *wtid; + if (NULL != cmd->details.deposit_wtid.bank_transfer_ref) + { + const struct Command *ref; + + ref = find_command (is, + cmd->details.deposit_wtid.bank_transfer_ref); + GNUNET_assert (NULL != ref); + if (0 != memcmp (wtid, + &ref->details.check_bank_deposit.wtid, + sizeof (struct TALER_WireTransferIdentifierRawP))) + { + GNUNET_break (0); + fail (is); + return; + } + } break; default: break; @@ -2656,7 +2677,8 @@ run (void *cls) { .oc = OC_DEPOSIT_WTID, .label = "deposit-wtid-ok", .expected_response_code = MHD_HTTP_OK, - .details.deposit_wtid.deposit_ref = "deposit-simple" }, + .details.deposit_wtid.deposit_ref = "deposit-simple", + .details.deposit_wtid.bank_transfer_ref = "check_bank_deposit-499c" }, /* TODO: trigger aggregation logic and then check the -- cgit v1.2.3 From 910e01d1c154390a7e724703bdd9a14046245d2c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 4 May 2016 05:38:29 +0200 Subject: be more careful with terminology --- src/bank-lib/test_bank_api_with_fakebank.c | 14 +++--- src/bank-lib/test_bank_interpreter.c | 6 +-- src/bank-lib/test_bank_interpreter.h | 14 +++--- src/exchange-lib/test_exchange_api.c | 74 +++++++++++++++--------------- 4 files changed, 54 insertions(+), 54 deletions(-) (limited to 'src/exchange-lib/test_exchange_api.c') diff --git a/src/bank-lib/test_bank_api_with_fakebank.c b/src/bank-lib/test_bank_api_with_fakebank.c index d0f73065..4241f075 100644 --- a/src/bank-lib/test_bank_api_with_fakebank.c +++ b/src/bank-lib/test_bank_api_with_fakebank.c @@ -53,15 +53,15 @@ run (void *cls) .details.admin_add_incoming.credit_account_no = 3, .details.admin_add_incoming.debit_account_no = 2, .details.admin_add_incoming.amount = "PUDOS:3.21" }, - /* check transactions arrived at fakebank */ - { .oc = TBI_OC_EXPECT_TRANSACTION, + /* check transfers arrived at fakebank */ + { .oc = TBI_OC_EXPECT_TRANSFER, .label = "expect-2", - .details.expect_transaction.cmd_ref = "deposit-2" }, - { .oc = TBI_OC_EXPECT_TRANSACTION, + .details.expect_transfer.cmd_ref = "deposit-2" }, + { .oc = TBI_OC_EXPECT_TRANSFER, .label = "expect-1", - .details.expect_transaction.cmd_ref = "deposit-1" }, - /* check transaction list is now empty */ - { .oc = TBI_OC_EXPECT_TRANSACTIONS_EMPTY, + .details.expect_transfer.cmd_ref = "deposit-1" }, + /* check transfer list is now empty */ + { .oc = TBI_OC_EXPECT_TRANSFERS_EMPTY, .label = "expect-empty" }, { .oc = TBI_OC_END } }; diff --git a/src/bank-lib/test_bank_interpreter.c b/src/bank-lib/test_bank_interpreter.c index 39129a54..840f9942 100644 --- a/src/bank-lib/test_bank_interpreter.c +++ b/src/bank-lib/test_bank_interpreter.c @@ -235,9 +235,9 @@ interpreter_run (void *cls) return; } return; - case TBI_OC_EXPECT_TRANSACTION: + case TBI_OC_EXPECT_TRANSFER: ref = find_command (is, - cmd->details.expect_transaction.cmd_ref); + cmd->details.expect_transfer.cmd_ref); GNUNET_assert (GNUNET_OK == TALER_string_to_amount (ref->details.admin_add_incoming.amount, &amount)); @@ -264,7 +264,7 @@ interpreter_run (void *cls) is->task = GNUNET_SCHEDULER_add_now (&interpreter_run, is); return; - case TBI_OC_EXPECT_TRANSACTIONS_EMPTY: + case TBI_OC_EXPECT_TRANSFERS_EMPTY: if (GNUNET_OK != FAKEBANK_check_empty (is->fakebank)) { GNUNET_break (0); diff --git a/src/bank-lib/test_bank_interpreter.h b/src/bank-lib/test_bank_interpreter.h index 329b5146..7f56caf4 100644 --- a/src/bank-lib/test_bank_interpreter.h +++ b/src/bank-lib/test_bank_interpreter.h @@ -45,14 +45,14 @@ enum TBI_OpCode TBI_OC_ADMIN_ADD_INCOMING, /** - * Expect that we have received the specified transaction at fakebank. + * Expect that we have received the specified transfer at fakebank. */ - TBI_OC_EXPECT_TRANSACTION, + TBI_OC_EXPECT_TRANSFER, /** - * Expect that we have exhaustively gone over all transactions at fakebank. + * Expect that we have exhaustively gone over all transfers at fakebank. */ - TBI_OC_EXPECT_TRANSACTIONS_EMPTY + TBI_OC_EXPECT_TRANSFERS_EMPTY }; @@ -118,8 +118,8 @@ struct TBI_Command } admin_add_incoming; /** - * If @e opcode is #TBI_OC_EXPECT_TRANSACTION, this - * specifies which transaction we expected. + * If @e opcode is #TBI_OC_EXPECT_TRANSFER, this + * specifies which transfer we expected. */ struct { @@ -129,7 +129,7 @@ struct TBI_Command */ const char *cmd_ref; - } expect_transaction; + } expect_transfer; } details; diff --git a/src/exchange-lib/test_exchange_api.c b/src/exchange-lib/test_exchange_api.c index 6a49b4ad..d05c54a8 100644 --- a/src/exchange-lib/test_exchange_api.c +++ b/src/exchange-lib/test_exchange_api.c @@ -139,12 +139,12 @@ enum OpCode /** * Check that the fakebank has received a certain transaction. */ - OC_CHECK_BANK_DEPOSIT, + OC_CHECK_BANK_TRANSFER, /** * Check that the fakebank has not received any other transactions. */ - OC_CHECK_BANK_DEPOSITS_EMPTY + OC_CHECK_BANK_TRANSFERS_EMPTY }; @@ -545,7 +545,7 @@ struct Command const char *deposit_ref; /** - * Which #OC_CHECK_BANK_DEPOSIT wtid should this match? NULL for none. + * Which #OC_CHECK_BANK_TRANSFER wtid should this match? NULL for none. */ const char *bank_transfer_ref; @@ -593,7 +593,7 @@ struct Command */ struct TALER_WireTransferIdentifierRawP wtid; - } check_bank_deposit; + } check_bank_transfer; } details; @@ -1470,7 +1470,7 @@ deposit_wtid_cb (void *cls, cmd->details.deposit_wtid.bank_transfer_ref); GNUNET_assert (NULL != ref); if (0 != memcmp (wtid, - &ref->details.check_bank_deposit.wtid, + &ref->details.check_bank_transfer.wtid, sizeof (struct TALER_WireTransferIdentifierRawP))) { GNUNET_break (0); @@ -1976,8 +1976,8 @@ interpreter_run (void *cls) case OC_DEPOSIT_WTID: cmd->details.wire_deposits.wtid = ref->details.deposit_wtid.wtid; break; - case OC_CHECK_BANK_DEPOSIT: - cmd->details.wire_deposits.wtid = ref->details.check_bank_deposit.wtid; + case OC_CHECK_BANK_TRANSFER: + cmd->details.wire_deposits.wtid = ref->details.check_bank_transfer.wtid; break; default: GNUNET_break (0); @@ -2079,10 +2079,10 @@ interpreter_run (void *cls) &maint_child_death, is); return; } - case OC_CHECK_BANK_DEPOSIT: + case OC_CHECK_BANK_TRANSFER: { if (GNUNET_OK != - TALER_string_to_amount (cmd->details.check_bank_deposit.amount, + TALER_string_to_amount (cmd->details.check_bank_transfer.amount, &amount)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -2095,9 +2095,9 @@ interpreter_run (void *cls) if (GNUNET_OK != FAKEBANK_check (fakebank, &amount, - cmd->details.check_bank_deposit.account_debit, - cmd->details.check_bank_deposit.account_credit, - &cmd->details.check_bank_deposit.wtid)) + cmd->details.check_bank_transfer.account_debit, + cmd->details.check_bank_transfer.account_credit, + &cmd->details.check_bank_transfer.wtid)) { GNUNET_break (0); fail (is); @@ -2106,7 +2106,7 @@ interpreter_run (void *cls) next_command (is); return; } - case OC_CHECK_BANK_DEPOSITS_EMPTY: + case OC_CHECK_BANK_TRANSFERS_EMPTY: { if (GNUNET_OK != FAKEBANK_check_empty (fakebank)) @@ -2328,9 +2328,9 @@ do_shutdown (void *cls) cmd->details.run_aggregator.aggregator_proc = NULL; } break; - case OC_CHECK_BANK_DEPOSIT: + case OC_CHECK_BANK_TRANSFER: break; - case OC_CHECK_BANK_DEPOSITS_EMPTY: + case OC_CHECK_BANK_TRANSFERS_EMPTY: break; default: GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -2646,39 +2646,39 @@ run (void *cls) { .oc = OC_RUN_AGGREGATOR, .label = "run-aggregator" }, - { .oc = OC_CHECK_BANK_DEPOSIT, - .label = "check_bank_deposit-499c", - .details.check_bank_deposit.amount = "EUR:4.99", - .details.check_bank_deposit.account_debit = 2, - .details.check_bank_deposit.account_credit = 42 + { .oc = OC_CHECK_BANK_TRANSFER, + .label = "check_bank_transfer-499c", + .details.check_bank_transfer.amount = "EUR:4.99", + .details.check_bank_transfer.account_debit = 2, + .details.check_bank_transfer.account_credit = 42 }, - { .oc = OC_CHECK_BANK_DEPOSIT, - .label = "check_bank_deposit-99c1", - .details.check_bank_deposit.amount = "EUR:0.99", - .details.check_bank_deposit.account_debit = 2, - .details.check_bank_deposit.account_credit = 42 + { .oc = OC_CHECK_BANK_TRANSFER, + .label = "check_bank_transfer-99c1", + .details.check_bank_transfer.amount = "EUR:0.99", + .details.check_bank_transfer.account_debit = 2, + .details.check_bank_transfer.account_credit = 42 }, - { .oc = OC_CHECK_BANK_DEPOSIT, - .label = "check_bank_deposit-99c2", - .details.check_bank_deposit.amount = "EUR:0.99", - .details.check_bank_deposit.account_debit = 2, - .details.check_bank_deposit.account_credit = 42 + { .oc = OC_CHECK_BANK_TRANSFER, + .label = "check_bank_transfer-99c2", + .details.check_bank_transfer.amount = "EUR:0.99", + .details.check_bank_transfer.account_debit = 2, + .details.check_bank_transfer.account_credit = 42 }, - { .oc = OC_CHECK_BANK_DEPOSIT, - .label = "check_bank_deposit-9c", - .details.check_bank_deposit.amount = "EUR:0.09", - .details.check_bank_deposit.account_debit = 2, - .details.check_bank_deposit.account_credit = 43 + { .oc = OC_CHECK_BANK_TRANSFER, + .label = "check_bank_transfer-9c", + .details.check_bank_transfer.amount = "EUR:0.09", + .details.check_bank_transfer.account_debit = 2, + .details.check_bank_transfer.account_credit = 43 }, - { .oc = OC_CHECK_BANK_DEPOSITS_EMPTY, + { .oc = OC_CHECK_BANK_TRANSFERS_EMPTY, .label = "check_bank_empty" }, { .oc = OC_DEPOSIT_WTID, .label = "deposit-wtid-ok", .expected_response_code = MHD_HTTP_OK, .details.deposit_wtid.deposit_ref = "deposit-simple", - .details.deposit_wtid.bank_transfer_ref = "check_bank_deposit-499c" }, + .details.deposit_wtid.bank_transfer_ref = "check_bank_transfer-499c" }, /* TODO: trigger aggregation logic and then check the -- cgit v1.2.3 From 455368147695d6f84bdfb814794483d4a0464e56 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 4 May 2016 06:10:41 +0200 Subject: fix issues in tracking API and tracking API test, resolves #4399 --- src/exchange-lib/exchange_api_wire_deposits.c | 12 +-- src/exchange-lib/test_exchange_api.c | 113 ++++++++++++++++++++------ src/exchange/taler-exchange-httpd_responses.c | 12 +-- 3 files changed, 99 insertions(+), 38 deletions(-) (limited to 'src/exchange-lib/test_exchange_api.c') diff --git a/src/exchange-lib/exchange_api_wire_deposits.c b/src/exchange-lib/exchange_api_wire_deposits.c index bcb29e87..446ac003 100644 --- a/src/exchange-lib/exchange_api_wire_deposits.c +++ b/src/exchange-lib/exchange_api_wire_deposits.c @@ -96,12 +96,12 @@ handle_wire_deposits_finished (void *cls, struct TALER_ExchangePublicKeyP exchange_pub; struct TALER_ExchangeSignatureP exchange_sig; struct GNUNET_JSON_Specification spec[] = { + TALER_JSON_spec_amount ("total", &total_amount), + GNUNET_JSON_spec_fixed_auto ("merchant_pub", &merchant_pub), GNUNET_JSON_spec_fixed_auto ("H_wire", &h_wire), - GNUNET_JSON_spec_fixed_auto ("exchange_pub", &exchange_pub), + GNUNET_JSON_spec_json ("deposits", &details_j), GNUNET_JSON_spec_fixed_auto ("exchange_sig", &exchange_sig), - GNUNET_JSON_spec_fixed_auto ("merchant_pub", &merchant_pub), - TALER_JSON_spec_amount ("total_amount", &total_amount), - GNUNET_JSON_spec_json ("details", &details_j), + GNUNET_JSON_spec_fixed_auto ("exchange_pub", &exchange_pub), GNUNET_JSON_spec_end() }; @@ -129,10 +129,10 @@ handle_wire_deposits_finished (void *cls, struct json_t *detail_j = json_array_get (details_j, i); struct GNUNET_JSON_Specification spec_detail[] = { GNUNET_JSON_spec_fixed_auto ("H_contract", &detail->h_contract), - TALER_JSON_spec_amount ("deposit_value", &detail->coin_value), - TALER_JSON_spec_amount ("deposit_fee", &detail->coin_fee), GNUNET_JSON_spec_uint64 ("transaction_id", &detail->transaction_id), GNUNET_JSON_spec_fixed_auto ("coin_pub", &detail->coin_pub), + TALER_JSON_spec_amount ("deposit_value", &detail->coin_value), + TALER_JSON_spec_amount ("deposit_fee", &detail->coin_fee), GNUNET_JSON_spec_end() }; diff --git a/src/exchange-lib/test_exchange_api.c b/src/exchange-lib/test_exchange_api.c index d05c54a8..05d18633 100644 --- a/src/exchange-lib/test_exchange_api.c +++ b/src/exchange-lib/test_exchange_api.c @@ -514,8 +514,13 @@ struct Command struct TALER_EXCHANGE_WireDepositsHandle *wdh; /** - * Reference to a /deposit/wtid command. If set, we use the - * WTID from that command. + * Reference to a command providing a WTID. If set, we use the + * WTID from that command. The command can be either an + * #OC_DEPOSIT_WTID or an #OC_CHECK_BANK_TRANSFER. In the + * case of the bank transfer, we check that the total amount + * claimed by the exchange matches the total amount transferred + * by the bank. In the case of a /deposit/wtid, we check + * that the wire details match. */ const char *wtid_ref; @@ -524,6 +529,13 @@ struct Command */ struct TALER_WireTransferIdentifierRawP wtid; + /** + * What is the expected total amount? Only used if + * @e expected_response_code was #MHD_HTTP_OK. + */ + const char *total_amount_expected; + + /* TODO: may want to add list of deposits we expected to see aggregated here in the future. */ @@ -549,12 +561,6 @@ struct Command */ const char *bank_transfer_ref; - /** - * What is the expected total amount? Only used if - * @e expected_response_code was #MHD_HTTP_OK. - */ - struct TALER_Amount total_amount_expected; - /** * Wire transfer identifier, set if #MHD_HTTP_OK was the response code. */ @@ -1362,6 +1368,7 @@ wire_deposits_cb (void *cls, struct InterpreterState *is = cls; struct Command *cmd = &is->commands[is->ip]; const struct Command *ref; + struct TALER_Amount expected_amount; cmd->details.wire_deposits.wdh = NULL; if (cmd->expected_response_code != http_status) @@ -1377,11 +1384,16 @@ wire_deposits_cb (void *cls, switch (http_status) { case MHD_HTTP_OK: - ref = find_command (is, - cmd->details.wire_deposits.wtid_ref); - GNUNET_assert (NULL != ref); + if (GNUNET_OK != + TALER_string_to_amount (cmd->details.wire_deposits.total_amount_expected, + &expected_amount)) + { + GNUNET_break (0); + fail (is); + return; + } if (0 != TALER_amount_cmp (total_amount, - &ref->details.deposit_wtid.total_amount_expected)) + &expected_amount)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Total amount missmatch to command %s\n", @@ -1391,28 +1403,65 @@ wire_deposits_cb (void *cls, fail (is); return; } - if (NULL != ref->details.deposit_wtid.deposit_ref) + ref = find_command (is, + cmd->details.wire_deposits.wtid_ref); + GNUNET_assert (NULL != ref); + switch (ref->oc) { - const struct Command *dep; - struct GNUNET_HashCode hw; - - dep = find_command (is, - ref->details.deposit_wtid.deposit_ref); - GNUNET_assert (NULL != dep); - GNUNET_CRYPTO_hash (dep->details.deposit.wire_details, - strlen (dep->details.deposit.wire_details), - &hw); - if (0 != memcmp (&hw, - h_wire, - sizeof (struct GNUNET_HashCode))) + case OC_DEPOSIT_WTID: + if (NULL != ref->details.deposit_wtid.deposit_ref) + { + const struct Command *dep; + struct GNUNET_HashCode hw; + json_t *wire; + + dep = find_command (is, + ref->details.deposit_wtid.deposit_ref); + GNUNET_assert (NULL != dep); + wire = json_loads (dep->details.deposit.wire_details, + JSON_REJECT_DUPLICATES, + NULL); + TALER_JSON_hash (wire, + &hw); + json_decref (wire); + if (0 != memcmp (&hw, + h_wire, + sizeof (struct GNUNET_HashCode))) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Wire hash missmatch to command %s\n", + cmd->label); + json_dumpf (json, stderr, 0); + fail (is); + return; + } + } + break; + case OC_CHECK_BANK_TRANSFER: + if (GNUNET_OK != + TALER_string_to_amount (ref->details.check_bank_transfer.amount, + &expected_amount)) + { + GNUNET_break (0); + fail (is); + return; + } + if (0 != TALER_amount_cmp (total_amount, + &expected_amount)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Wire hash missmatch to command %s\n", + "Total amount missmatch to command %s\n", + http_status, cmd->label); json_dumpf (json, stderr, 0); fail (is); return; } + break; + default: + GNUNET_break (0); + fail (is); + return; } break; default: @@ -2680,6 +2729,18 @@ run (void *cls) .details.deposit_wtid.deposit_ref = "deposit-simple", .details.deposit_wtid.bank_transfer_ref = "check_bank_transfer-499c" }, + { .oc = OC_WIRE_DEPOSITS, + .label = "wire-deposits-sucess-bank", + .expected_response_code = MHD_HTTP_OK, + .details.wire_deposits.wtid_ref = "check_bank_transfer-99c1", + .details.wire_deposits.total_amount_expected = "EUR:0.99" }, + + { .oc = OC_WIRE_DEPOSITS, + .label = "wire-deposits-sucess-wtid", + .expected_response_code = MHD_HTTP_OK, + .details.wire_deposits.wtid_ref = "deposit-wtid-ok", + .details.wire_deposits.total_amount_expected = "EUR:4.99" }, + /* TODO: trigger aggregation logic and then check the cases where tracking succeeds! */ diff --git a/src/exchange/taler-exchange-httpd_responses.c b/src/exchange/taler-exchange-httpd_responses.c index 7bac0d88..c8a72f49 100644 --- a/src/exchange/taler-exchange-httpd_responses.c +++ b/src/exchange/taler-exchange-httpd_responses.c @@ -1184,14 +1184,14 @@ TMH_RESPONSE_reply_wire_deposit_details (struct MHD_Connection *connection, &dd, sizeof (struct TALER_WireDepositDetailP)); json_array_append (deposits, - json_pack ("{s:o, s:o, s:o, s:I, s:o}", - "deposit_value", TALER_JSON_from_amount (&wdd_pos->deposit_value), - "deposit_fee", TALER_JSON_from_amount (&wdd_pos->deposit_fee), + json_pack ("{s:o, s:I, s:o, s:o, s:o}", "H_contract", GNUNET_JSON_from_data (&wdd_pos->h_contract, sizeof (struct GNUNET_HashCode)), "transaction_id", (json_int_t) wdd_pos->transaction_id, "coin_pub", GNUNET_JSON_from_data (&wdd_pos->coin_pub, - sizeof (struct TALER_CoinSpendPublicKeyP)))); + sizeof (struct TALER_CoinSpendPublicKeyP)), + "deposit_value", TALER_JSON_from_amount (&wdd_pos->deposit_value), + "deposit_fee", TALER_JSON_from_amount (&wdd_pos->deposit_fee))); } wdp.purpose.purpose = htonl (TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE_DEPOSIT); wdp.purpose.size = htonl (sizeof (struct TALER_WireDepositDataPS)); @@ -1206,11 +1206,11 @@ TMH_RESPONSE_reply_wire_deposit_details (struct MHD_Connection *connection, &sig); return TMH_RESPONSE_reply_json_pack (connection, MHD_HTTP_OK, - "{s:o, s:o, s:o, s:o}", + "{s:o, s:o, s:o, s:o, s:o, s:o}", "total", TALER_JSON_from_amount (total), "merchant_pub", GNUNET_JSON_from_data (merchant_pub, sizeof (struct TALER_MerchantPublicKeyP)), - "h_wire", GNUNET_JSON_from_data (h_wire, + "H_wire", GNUNET_JSON_from_data (h_wire, sizeof (struct GNUNET_HashCode)), "deposits", deposits, "exchange_sig", GNUNET_JSON_from_data (&sig, -- cgit v1.2.3 From ad6a40aaa580551b2861d51740a427af05d9f165 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 4 May 2016 13:21:22 +0200 Subject: fix fmt string issues --- src/bank-lib/bank_api_admin.c | 2 +- src/exchange-lib/exchange_api_admin.c | 2 +- src/exchange-lib/exchange_api_deposit.c | 2 +- src/exchange-lib/exchange_api_deposit_wtid.c | 2 +- src/exchange-lib/exchange_api_handle.c | 2 +- src/exchange-lib/exchange_api_refresh.c | 4 ++-- src/exchange-lib/exchange_api_refresh_link.c | 2 +- src/exchange-lib/exchange_api_refund.c | 2 +- src/exchange-lib/exchange_api_reserve.c | 4 ++-- src/exchange-lib/exchange_api_wire.c | 2 +- src/exchange-lib/exchange_api_wire_deposits.c | 2 +- src/exchange-lib/test_exchange_api.c | 8 +++----- src/exchangedb/exchangedb_keyio.c | 2 +- 13 files changed, 17 insertions(+), 19 deletions(-) (limited to 'src/exchange-lib/test_exchange_api.c') diff --git a/src/bank-lib/bank_api_admin.c b/src/bank-lib/bank_api_admin.c index df352518..5cd82b09 100644 --- a/src/bank-lib/bank_api_admin.c +++ b/src/bank-lib/bank_api_admin.c @@ -143,7 +143,7 @@ handle_admin_add_incoming_finished (void *cls, /* unexpected response code */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unexpected response code %u\n", - response_code); + (unsigned int) response_code); GNUNET_break (0); response_code = 0; break; diff --git a/src/exchange-lib/exchange_api_admin.c b/src/exchange-lib/exchange_api_admin.c index 06a39ffa..068a11e0 100644 --- a/src/exchange-lib/exchange_api_admin.c +++ b/src/exchange-lib/exchange_api_admin.c @@ -122,7 +122,7 @@ handle_admin_add_incoming_finished (void *cls, /* unexpected response code */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unexpected response code %u\n", - response_code); + (unsigned int) response_code); GNUNET_break (0); response_code = 0; break; diff --git a/src/exchange-lib/exchange_api_deposit.c b/src/exchange-lib/exchange_api_deposit.c index 8a2837ac..0dc03637 100644 --- a/src/exchange-lib/exchange_api_deposit.c +++ b/src/exchange-lib/exchange_api_deposit.c @@ -246,7 +246,7 @@ handle_deposit_finished (void *cls, /* unexpected response code */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unexpected response code %u\n", - response_code); + (unsigned int) response_code); GNUNET_break (0); response_code = 0; break; diff --git a/src/exchange-lib/exchange_api_deposit_wtid.c b/src/exchange-lib/exchange_api_deposit_wtid.c index 8547979b..b3c5b328 100644 --- a/src/exchange-lib/exchange_api_deposit_wtid.c +++ b/src/exchange-lib/exchange_api_deposit_wtid.c @@ -224,7 +224,7 @@ handle_deposit_wtid_finished (void *cls, /* unexpected response code */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unexpected response code %u\n", - response_code); + (unsigned int) response_code); GNUNET_break (0); response_code = 0; break; diff --git a/src/exchange-lib/exchange_api_handle.c b/src/exchange-lib/exchange_api_handle.c index 04508aa3..e5586022 100644 --- a/src/exchange-lib/exchange_api_handle.c +++ b/src/exchange-lib/exchange_api_handle.c @@ -632,7 +632,7 @@ keys_completed_cb (void *cls, default: GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unexpected response code %u\n", - response_code); + (unsigned int) response_code); break; } diff --git a/src/exchange-lib/exchange_api_refresh.c b/src/exchange-lib/exchange_api_refresh.c index f112152c..a63f03ac 100644 --- a/src/exchange-lib/exchange_api_refresh.c +++ b/src/exchange-lib/exchange_api_refresh.c @@ -1325,7 +1325,7 @@ handle_refresh_melt_finished (void *cls, /* unexpected response code */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unexpected response code %u\n", - response_code); + (unsigned int) response_code); GNUNET_break (0); response_code = 0; break; @@ -1860,7 +1860,7 @@ handle_refresh_reveal_finished (void *cls, /* unexpected response code */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unexpected response code %u\n", - response_code); + (unsigned int) response_code); GNUNET_break (0); response_code = 0; break; diff --git a/src/exchange-lib/exchange_api_refresh_link.c b/src/exchange-lib/exchange_api_refresh_link.c index e809c3f1..cd3f6d72 100644 --- a/src/exchange-lib/exchange_api_refresh_link.c +++ b/src/exchange-lib/exchange_api_refresh_link.c @@ -364,7 +364,7 @@ handle_refresh_link_finished (void *cls, /* unexpected response code */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unexpected response code %u\n", - response_code); + (unsigned int) response_code); GNUNET_break (0); response_code = 0; break; diff --git a/src/exchange-lib/exchange_api_refund.c b/src/exchange-lib/exchange_api_refund.c index f29488fb..a6069f0b 100644 --- a/src/exchange-lib/exchange_api_refund.c +++ b/src/exchange-lib/exchange_api_refund.c @@ -177,7 +177,7 @@ handle_refund_finished (void *cls, /* unexpected response code */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unexpected response code %u\n", - response_code); + (unsigned int) response_code); GNUNET_break (0); response_code = 0; break; diff --git a/src/exchange-lib/exchange_api_reserve.c b/src/exchange-lib/exchange_api_reserve.c index d3e55ed9..056d2f08 100644 --- a/src/exchange-lib/exchange_api_reserve.c +++ b/src/exchange-lib/exchange_api_reserve.c @@ -363,7 +363,7 @@ handle_reserve_status_finished (void *cls, /* unexpected response code */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unexpected response code %u\n", - response_code); + (unsigned int) response_code); GNUNET_break (0); response_code = 0; break; @@ -738,7 +738,7 @@ handle_reserve_withdraw_finished (void *cls, /* unexpected response code */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unexpected response code %u\n", - response_code); + (unsigned int) response_code); GNUNET_break (0); response_code = 0; break; diff --git a/src/exchange-lib/exchange_api_wire.c b/src/exchange-lib/exchange_api_wire.c index 453da14d..7515806a 100644 --- a/src/exchange-lib/exchange_api_wire.c +++ b/src/exchange-lib/exchange_api_wire.c @@ -203,7 +203,7 @@ handle_wire_finished (void *cls, /* unexpected response code */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unexpected response code %u\n", - response_code); + (unsigned int) response_code); GNUNET_break (0); response_code = 0; break; diff --git a/src/exchange-lib/exchange_api_wire_deposits.c b/src/exchange-lib/exchange_api_wire_deposits.c index 446ac003..0601f9b4 100644 --- a/src/exchange-lib/exchange_api_wire_deposits.c +++ b/src/exchange-lib/exchange_api_wire_deposits.c @@ -217,7 +217,7 @@ handle_wire_deposits_finished (void *cls, /* unexpected response code */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unexpected response code %u\n", - response_code); + (unsigned int) response_code); GNUNET_break (0); response_code = 0; break; diff --git a/src/exchange-lib/test_exchange_api.c b/src/exchange-lib/test_exchange_api.c index 05d18633..49c124c8 100644 --- a/src/exchange-lib/test_exchange_api.c +++ b/src/exchange-lib/test_exchange_api.c @@ -1270,9 +1270,9 @@ find_pk (const struct TALER_EXCHANGE_Keys *keys, GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Have denomination key for `%s', but with wrong expiration range %llu vs [%llu,%llu)\n", str, - now.abs_value_us, - pk->valid_from.abs_value_us, - pk->withdraw_valid_until.abs_value_us); + (unsigned long long) now.abs_value_us, + (unsigned long long) pk->valid_from.abs_value_us, + (unsigned long long) pk->withdraw_valid_until.abs_value_us); GNUNET_free (str); return NULL; } @@ -1397,7 +1397,6 @@ wire_deposits_cb (void *cls, { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Total amount missmatch to command %s\n", - http_status, cmd->label); json_dumpf (json, stderr, 0); fail (is); @@ -1451,7 +1450,6 @@ wire_deposits_cb (void *cls, { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Total amount missmatch to command %s\n", - http_status, cmd->label); json_dumpf (json, stderr, 0); fail (is); diff --git a/src/exchangedb/exchangedb_keyio.c b/src/exchangedb/exchangedb_keyio.c index 9f170f64..5f29cb0d 100644 --- a/src/exchangedb/exchangedb_keyio.c +++ b/src/exchangedb/exchangedb_keyio.c @@ -70,7 +70,7 @@ signkeys_iterate_dir_iter (void *cls, "Invalid signkey file `%s': wrong size (%d, expected %u)\n", filename, (int) nread, - sizeof (struct TALER_EXCHANGEDB_PrivateSigningKeyInformationP)); + (unsigned int) sizeof (struct TALER_EXCHANGEDB_PrivateSigningKeyInformationP)); return GNUNET_OK; } return skc->it (skc->it_cls, -- cgit v1.2.3