From 4197736fe245d356f82675ed8be23db082a56670 Mon Sep 17 00:00:00 2001 From: sowle Date: Sat, 28 Dec 2024 04:21:58 +0100 Subject: [PATCH 1/2] coretests: gcc compilation fixed for fill_tx_rpc_inputs --- tests/core_tests/daemon_rpc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/core_tests/daemon_rpc.cpp b/tests/core_tests/daemon_rpc.cpp index f968719e..502db5c0 100644 --- a/tests/core_tests/daemon_rpc.cpp +++ b/tests/core_tests/daemon_rpc.cpp @@ -534,7 +534,7 @@ bool fill_tx_rpc_inputs::c7(const currency::core& core, const size_t event_posit { const auto pointer_entry{core.get_blockchain_storage().get_tx_chain_entry(reference.tx_id)}; - CHECK_AND_ASSERT_NEQ(pointer_entry, nullptr); + CHECK_AND_ASSERT(pointer_entry, false); CHECK_AND_ASSERT(reference.n >= pointer_entry->m_global_output_indexes.size(), false); } } @@ -563,7 +563,7 @@ bool fill_tx_rpc_inputs::c8(const currency::core& core, const size_t event_posit CHECK_AND_ASSERT_EQ(reference.tx_id, currency::null_hash); CHECK_AND_ASSERT_EQ(reference.n, 0u); - CHECK_AND_ASSERT_EQ(core.get_blockchain_storage().get_tx_chain_entry(reference.tx_id), nullptr); + CHECK_AND_ASSERT(core.get_blockchain_storage().get_tx_chain_entry(reference.tx_id), false); } } From 13b09ee91437b9588727130e9080ef8aa7b14f96 Mon Sep 17 00:00:00 2001 From: sowle Date: Sat, 28 Dec 2024 15:17:32 +0100 Subject: [PATCH 2/2] coretests: fill_tx_rpc_inputs temporarily disabled --- tests/core_tests/chaingen_main.cpp | 2 +- tests/core_tests/daemon_rpc.cpp | 3 +++ tests/core_tests/daemon_rpc.h | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/core_tests/chaingen_main.cpp b/tests/core_tests/chaingen_main.cpp index 8c4fef66..6693702e 100644 --- a/tests/core_tests/chaingen_main.cpp +++ b/tests/core_tests/chaingen_main.cpp @@ -1154,7 +1154,7 @@ int main(int argc, char* argv[]) GENERATE_AND_PLAY(one_block); GENERATE_AND_PLAY(gen_ring_signature_1); GENERATE_AND_PLAY(gen_ring_signature_2); - GENERATE_AND_PLAY(fill_tx_rpc_inputs); + //GENERATE_AND_PLAY(fill_tx_rpc_inputs); temporary disable, waiting for fix from @stepan-dolgorukov //GENERATE_AND_PLAY(gen_ring_signature_big); // Takes up to XXX hours (if CURRENCY_MINED_MONEY_UNLOCK_WINDOW == 10) // tests for outputs mixing in diff --git a/tests/core_tests/daemon_rpc.cpp b/tests/core_tests/daemon_rpc.cpp index 502db5c0..ca09027e 100644 --- a/tests/core_tests/daemon_rpc.cpp +++ b/tests/core_tests/daemon_rpc.cpp @@ -1,3 +1,6 @@ +// Copyright (c) 2024 Zano Project +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "chaingen.h" #include "daemon_rpc.h" diff --git a/tests/core_tests/daemon_rpc.h b/tests/core_tests/daemon_rpc.h index 75efa31b..3802b53f 100644 --- a/tests/core_tests/daemon_rpc.h +++ b/tests/core_tests/daemon_rpc.h @@ -1,3 +1,6 @@ +// Copyright (c) 2024 Zano Project +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #pragma once #include