From a04f0789a3253d6dc37733973ee227abbe826971 Mon Sep 17 00:00:00 2001 From: RickiNano <81099017+RickiNano@users.noreply.github.com> Date: Sun, 21 Jan 2024 19:32:28 +0100 Subject: [PATCH] Assert conversions part 2 (#4376) --- nano/core_test/node.cpp | 6 +++--- nano/core_test/socket.cpp | 6 +++--- nano/core_test/uint256_union.cpp | 4 ++-- nano/rpc_test/rpc.cpp | 2 +- nano/slow_test/vote_processor.cpp | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nano/core_test/node.cpp b/nano/core_test/node.cpp index 239d29d3..dcf72194 100644 --- a/nano/core_test/node.cpp +++ b/nano/core_test/node.cpp @@ -25,7 +25,7 @@ TEST (node, null_account) nano::account default_account{}; ASSERT_FALSE (default_account == nullptr); - ASSERT_TRUE (default_account != nullptr); + ASSERT_NE (default_account, nullptr); } TEST (node, stop) @@ -47,7 +47,7 @@ TEST (node, work_generate) auto difficulty = nano::difficulty::from_multiplier (1.5, node.network_params.work.base); auto work = node.work_generate_blocking (version, root, difficulty); ASSERT_TRUE (work.is_initialized ()); - ASSERT_TRUE (nano::dev::network_params.work.difficulty (version, root, *work) >= difficulty); + ASSERT_GE (nano::dev::network_params.work.difficulty (version, root, *work), difficulty); } { auto difficulty = nano::difficulty::from_multiplier (0.5, node.network_params.work.base); @@ -57,7 +57,7 @@ TEST (node, work_generate) work = node.work_generate_blocking (version, root, difficulty); } while (nano::dev::network_params.work.difficulty (version, root, *work) >= node.network_params.work.base); ASSERT_TRUE (work.is_initialized ()); - ASSERT_TRUE (nano::dev::network_params.work.difficulty (version, root, *work) >= difficulty); + ASSERT_GE (nano::dev::network_params.work.difficulty (version, root, *work), difficulty); ASSERT_FALSE (nano::dev::network_params.work.difficulty (version, root, *work) >= node.network_params.work.base); } } diff --git a/nano/core_test/socket.cpp b/nano/core_test/socket.cpp index 02a19e9c..d4b7f144 100644 --- a/nano/core_test/socket.cpp +++ b/nano/core_test/socket.cpp @@ -115,7 +115,7 @@ TEST (socket, max_connections_per_ip) auto server_port = system.get_available_port (); const auto max_ip_connections = node->network_params.network.max_peers_per_ip; - ASSERT_TRUE (max_ip_connections >= 1); + ASSERT_GE (max_ip_connections, 1); const auto max_global_connections = 1000; @@ -235,7 +235,7 @@ TEST (socket, max_connections_per_subnetwork) boost::asio::ip::tcp::endpoint listen_endpoint{ boost::asio::ip::address_v6::any (), server_port }; const auto max_subnetwork_connections = node->network_params.network.max_peers_per_subnetwork; - ASSERT_TRUE (max_subnetwork_connections >= 1); + ASSERT_GE (max_subnetwork_connections, 1); const auto max_global_connections = 1000; @@ -295,7 +295,7 @@ TEST (socket, disabled_max_peers_per_ip) auto server_port = system.get_available_port (); const auto max_ip_connections = node->network_params.network.max_peers_per_ip; - ASSERT_TRUE (max_ip_connections >= 1); + ASSERT_GE (max_ip_connections, 1); const auto max_global_connections = 1000; diff --git a/nano/core_test/uint256_union.cpp b/nano/core_test/uint256_union.cpp index c85c6127..86c82f66 100644 --- a/nano/core_test/uint256_union.cpp +++ b/nano/core_test/uint256_union.cpp @@ -614,7 +614,7 @@ TEST (random_pool, generate_word64) for (auto i = 1; i < 10; ++i) { - ASSERT_TRUE (occurrences[i] > 0); + ASSERT_GT (occurrences[i], 0); } } @@ -624,5 +624,5 @@ TEST (random_pool, generate_word64_big_number) uint64_t min = static_cast (std::numeric_limits::max ()) + 1; uint64_t max = std::numeric_limits::max (); auto big_random = nano::random_pool::generate_word64 (min, max); - ASSERT_TRUE (big_random >= min); + ASSERT_GE (big_random, min); } diff --git a/nano/rpc_test/rpc.cpp b/nano/rpc_test/rpc.cpp index 056d05a1..f8bba8ae 100644 --- a/nano/rpc_test/rpc.cpp +++ b/nano/rpc_test/rpc.cpp @@ -6617,7 +6617,7 @@ TEST (rpc, receive_work_disabled) nano::keypair key1; ASSERT_TRUE (worker_node.work_generation_enabled ()); auto send1 (wallet->send_action (nano::dev::genesis_key.pub, key1.pub, node->config.receive_minimum.number () - 1, *worker_node.work_generate_blocking (nano::dev::genesis->hash ()), false)); - ASSERT_TRUE (send1 != nullptr); + ASSERT_NE (send1, nullptr); ASSERT_TIMELY (5s, node->balance (nano::dev::genesis_key.pub) != nano::dev::constants.genesis_amount); ASSERT_FALSE (node->store.account.exists (node->store.tx_begin_read (), key1.pub)); ASSERT_TRUE (node->store.block.exists (node->store.tx_begin_read (), send1->hash ())); diff --git a/nano/slow_test/vote_processor.cpp b/nano/slow_test/vote_processor.cpp index eaae3557..ff1ae1f5 100644 --- a/nano/slow_test/vote_processor.cpp +++ b/nano/slow_test/vote_processor.cpp @@ -75,5 +75,5 @@ TEST (vote_processor, producer_consumer) consumer_thread.join (); monitor_thread.join (); - ASSERT_TRUE (producer_wins > consumer_wins); + ASSERT_GT (producer_wins, consumer_wins); }