From 7a463d806571ef43cdee2845a641d308f7c35801 Mon Sep 17 00:00:00 2001 From: sowle Date: Tue, 22 Jul 2025 21:34:04 +0300 Subject: [PATCH] coretests adapted to temp changes --- tests/core_tests/wallet_rpc_tests.cpp | 23 ++++++++++++----------- tests/core_tests/wallet_tests.cpp | 5 +++-- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/tests/core_tests/wallet_rpc_tests.cpp b/tests/core_tests/wallet_rpc_tests.cpp index 9ac9fc2d..76403881 100644 --- a/tests/core_tests/wallet_rpc_tests.cpp +++ b/tests/core_tests/wallet_rpc_tests.cpp @@ -633,37 +633,38 @@ bool wallet_rpc_exchange_suite::c1(currency::core& c, size_t ev_index, const std CHECK_RESPONSE_EQUAL(resp.pi.transfers_count == 6); CHECK_RESPONSE_EQUAL(resp.total_transfers == 6); CHECK_RESPONSE_EQUAL(resp.transfers.size() == 6); - CHECK_RESPONSE_EQUAL(resp.transfers[0].comment == TRANSFER_COMMENT); + // below: tx_comment is temporary disabled, @#@#TODO -- sowle + //CHECK_RESPONSE_EQUAL(resp.transfers[0].comment == TRANSFER_COMMENT); CHECK_RESPONSE_EQUAL(resp.transfers[0].amount == TRANSFER_AMOUNT); CHECK_RESPONSE_EQUAL(resp.transfers[0].is_income == true); CHECK_RESPONSE_EQUAL(epee::string_tools::buff_to_hex_nodelimer(resp.transfers[0].payment_id) == carol_payment_id); CHECK_RESPONSE_EQUAL(boost::lexical_cast(resp.transfers[0].tx_hash) == carol_tx3); - CHECK_RESPONSE_EQUAL(resp.transfers[1].comment == TRANSFER_COMMENT); + //CHECK_RESPONSE_EQUAL(resp.transfers[1].comment == TRANSFER_COMMENT); CHECK_RESPONSE_EQUAL(resp.transfers[1].amount == TRANSFER_AMOUNT); CHECK_RESPONSE_EQUAL(resp.transfers[1].is_income == true); CHECK_RESPONSE_EQUAL(epee::string_tools::buff_to_hex_nodelimer(resp.transfers[1].payment_id) == carol_payment_id); CHECK_RESPONSE_EQUAL(boost::lexical_cast(resp.transfers[1].tx_hash) == carol_tx2); - CHECK_RESPONSE_EQUAL(resp.transfers[2].comment == TRANSFER_COMMENT); + //CHECK_RESPONSE_EQUAL(resp.transfers[2].comment == TRANSFER_COMMENT); CHECK_RESPONSE_EQUAL(resp.transfers[2].amount == TRANSFER_AMOUNT); CHECK_RESPONSE_EQUAL(resp.transfers[2].is_income == true); CHECK_RESPONSE_EQUAL(epee::string_tools::buff_to_hex_nodelimer(resp.transfers[2].payment_id) == carol_payment_id); CHECK_RESPONSE_EQUAL(boost::lexical_cast(resp.transfers[2].tx_hash) == carol_tx1); - CHECK_RESPONSE_EQUAL(resp.transfers[3].comment == TRANSFER_COMMENT); + //CHECK_RESPONSE_EQUAL(resp.transfers[3].comment == TRANSFER_COMMENT); CHECK_RESPONSE_EQUAL(resp.transfers[3].amount == TRANSFER_AMOUNT); CHECK_RESPONSE_EQUAL(resp.transfers[3].is_income == true); CHECK_RESPONSE_EQUAL(epee::string_tools::buff_to_hex_nodelimer(resp.transfers[3].payment_id) == bob_payment_id); CHECK_RESPONSE_EQUAL(boost::lexical_cast(resp.transfers[3].tx_hash) == bob_tx2); - CHECK_RESPONSE_EQUAL(resp.transfers[4].comment == TRANSFER_COMMENT); + //CHECK_RESPONSE_EQUAL(resp.transfers[4].comment == TRANSFER_COMMENT); CHECK_RESPONSE_EQUAL(resp.transfers[4].amount == TRANSFER_AMOUNT); CHECK_RESPONSE_EQUAL(resp.transfers[4].is_income == true); CHECK_RESPONSE_EQUAL(epee::string_tools::buff_to_hex_nodelimer(resp.transfers[4].payment_id) == bob_payment_id); CHECK_RESPONSE_EQUAL(boost::lexical_cast(resp.transfers[4].tx_hash) == bob_tx1); - CHECK_RESPONSE_EQUAL(resp.transfers[5].comment == TRANSFER_COMMENT); + //CHECK_RESPONSE_EQUAL(resp.transfers[5].comment == TRANSFER_COMMENT); CHECK_RESPONSE_EQUAL(resp.transfers[5].amount == TRANSFER_AMOUNT); CHECK_RESPONSE_EQUAL(resp.transfers[5].is_income == true); CHECK_RESPONSE_EQUAL(epee::string_tools::buff_to_hex_nodelimer(resp.transfers[5].payment_id) == alice_payment_id); @@ -680,25 +681,25 @@ bool wallet_rpc_exchange_suite::c1(currency::core& c, size_t ev_index, const std CHECK_RESPONSE_EQUAL(resp.pi.transfers_count == 6); CHECK_RESPONSE_EQUAL(resp.total_transfers == 6); CHECK_RESPONSE_EQUAL(resp.transfers.size() == 4); - CHECK_RESPONSE_EQUAL(resp.transfers[0].comment == TRANSFER_COMMENT); + //CHECK_RESPONSE_EQUAL(resp.transfers[0].comment == TRANSFER_COMMENT); CHECK_RESPONSE_EQUAL(resp.transfers[0].amount == TRANSFER_AMOUNT); CHECK_RESPONSE_EQUAL(resp.transfers[0].is_income == true); CHECK_RESPONSE_EQUAL(epee::string_tools::buff_to_hex_nodelimer(resp.transfers[0].payment_id) == carol_payment_id); CHECK_RESPONSE_EQUAL(boost::lexical_cast(resp.transfers[0].tx_hash) == carol_tx1); - CHECK_RESPONSE_EQUAL(resp.transfers[1].comment == TRANSFER_COMMENT); + //CHECK_RESPONSE_EQUAL(resp.transfers[1].comment == TRANSFER_COMMENT); CHECK_RESPONSE_EQUAL(resp.transfers[1].amount == TRANSFER_AMOUNT); CHECK_RESPONSE_EQUAL(resp.transfers[1].is_income == true); CHECK_RESPONSE_EQUAL(epee::string_tools::buff_to_hex_nodelimer(resp.transfers[1].payment_id) == bob_payment_id); CHECK_RESPONSE_EQUAL(boost::lexical_cast(resp.transfers[1].tx_hash) == bob_tx2); - CHECK_RESPONSE_EQUAL(resp.transfers[2].comment == TRANSFER_COMMENT); + //CHECK_RESPONSE_EQUAL(resp.transfers[2].comment == TRANSFER_COMMENT); CHECK_RESPONSE_EQUAL(resp.transfers[2].amount == TRANSFER_AMOUNT); CHECK_RESPONSE_EQUAL(resp.transfers[2].is_income == true); CHECK_RESPONSE_EQUAL(epee::string_tools::buff_to_hex_nodelimer(resp.transfers[2].payment_id) == bob_payment_id); CHECK_RESPONSE_EQUAL(boost::lexical_cast(resp.transfers[2].tx_hash) == bob_tx1); - CHECK_RESPONSE_EQUAL(resp.transfers[3].comment == TRANSFER_COMMENT); + //CHECK_RESPONSE_EQUAL(resp.transfers[3].comment == TRANSFER_COMMENT); CHECK_RESPONSE_EQUAL(resp.transfers[3].amount == TRANSFER_AMOUNT); CHECK_RESPONSE_EQUAL(resp.transfers[3].is_income == true); CHECK_RESPONSE_EQUAL(epee::string_tools::buff_to_hex_nodelimer(resp.transfers[3].payment_id) == alice_payment_id); @@ -737,7 +738,7 @@ bool wallet_rpc_exchange_suite::c1(currency::core& c, size_t ev_index, const std CHECK_RESPONSE_EQUAL(st_resp.in.size() == 1); - CHECK_RESPONSE_EQUAL(st_resp.in.begin()->comment == TRANSFER_COMMENT); + //CHECK_RESPONSE_EQUAL(st_resp.in.begin()->comment == TRANSFER_COMMENT); CHECK_RESPONSE_EQUAL(st_resp.in.begin()->amount == TRANSFER_AMOUNT); CHECK_RESPONSE_EQUAL(st_resp.in.begin()->is_income == true); CHECK_RESPONSE_EQUAL(epee::string_tools::buff_to_hex_nodelimer(st_resp.in.begin()->payment_id) == bob_payment_id); diff --git a/tests/core_tests/wallet_tests.cpp b/tests/core_tests/wallet_tests.cpp index e3039a06..887f0581 100644 --- a/tests/core_tests/wallet_tests.cpp +++ b/tests/core_tests/wallet_tests.cpp @@ -3545,8 +3545,9 @@ bool wallet_sending_to_integrated_address::c1(currency::core& c, size_t ev_index if (wti.payment_id.empty()) return true; // skip another outputs CHECK_AND_ASSERT_MES(wti.payment_id == payment_id, false, "incorrect payment id"); - CHECK_AND_ASSERT_MES(wti.remote_addresses.size() == 1, false, "remote_addressed.size() = " << wti.remote_addresses.size()); - CHECK_AND_ASSERT_MES(wti.remote_addresses[0] == alice_integrated_address, false, "incorrect remote address"); + // below: tx_payer and tx_receiver are temporary disabled, @#@#TODO -- sowle + //CHECK_AND_ASSERT_MES(wti.remote_addresses.size() == 1, false, "remote_addressed.size() = " << wti.remote_addresses.size()); + //CHECK_AND_ASSERT_MES(wti.remote_addresses[0] == alice_integrated_address, false, "incorrect remote address"); callback_succeded = true; return true; }