From 260e287685680d97448920432b4673469a99a83f Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 8 Jan 2021 23:36:09 +0100 Subject: change wire_reference to be uint64_t always; more work on lrbt_callbacks --- src/testing/testing_api_cmd_bank_admin_add_incoming.c | 10 +--------- src/testing/testing_api_cmd_status.c | 7 ++----- 2 files changed, 3 insertions(+), 14 deletions(-) (limited to 'src/testing') diff --git a/src/testing/testing_api_cmd_bank_admin_add_incoming.c b/src/testing/testing_api_cmd_bank_admin_add_incoming.c index df1eb0a32..e467063aa 100644 --- a/src/testing/testing_api_cmd_bank_admin_add_incoming.c +++ b/src/testing/testing_api_cmd_bank_admin_add_incoming.c @@ -114,11 +114,6 @@ struct AdminAddIncomingState */ uint64_t serial_id; - /** - * Set to the wire transfer's row ID in network byte order. - */ - uint64_t row_id_nbo; - /** * Timestamp of the transaction (as returned from the bank). */ @@ -214,11 +209,8 @@ confirmation_cb (void *cls, struct TALER_TESTING_Interpreter *is = fts->is; (void) json; - fts->row_id_nbo = GNUNET_htonll (serial_id); fts->reserve_history.details.in_details.timestamp = timestamp; - fts->reserve_history.details.in_details.wire_reference = &fts->row_id_nbo; - fts->reserve_history.details.in_details.wire_reference_size - = sizeof (fts->row_id_nbo); + fts->reserve_history.details.in_details.wire_reference = serial_id; fts->aih = NULL; switch (http_status) { diff --git a/src/testing/testing_api_cmd_status.c b/src/testing/testing_api_cmd_status.c index 26c1b813b..f395af28a 100644 --- a/src/testing/testing_api_cmd_status.c +++ b/src/testing/testing_api_cmd_status.c @@ -84,13 +84,10 @@ history_entry_cmp (const struct TALER_EXCHANGE_ReserveHistory *h1, if ( (0 == TALER_amount_cmp (&h1->amount, &h2->amount)) && - (h1->details.in_details.wire_reference_size == - h2->details.in_details.wire_reference_size) && (0 == strcasecmp (h1->details.in_details.sender_url, h2->details.in_details.sender_url)) && - (0 == memcmp (h1->details.in_details.wire_reference, - h2->details.in_details.wire_reference, - h1->details.in_details.wire_reference_size)) && + (h1->details.in_details.wire_reference == + h2->details.in_details.wire_reference) && (h1->details.in_details.timestamp.abs_value_us == h2->details.in_details.timestamp.abs_value_us) ) return 0; -- cgit v1.2.3