From 7b5e4d75f87a362b0e8449629170d278427ef5e8 Mon Sep 17 00:00:00 2001 From: theohax <81556890+theohax@users.noreply.github.com> Date: Sat, 16 Oct 2021 07:44:03 +0300 Subject: [PATCH] Add [[nodiscard]] attribute to node::process method (#3505) * Add [[nodiscard]] attribute to node::process method --- nano/core_test/bootstrap.cpp | 4 ++-- nano/core_test/election.cpp | 10 +++++----- nano/core_test/gap_cache.cpp | 2 +- nano/node/node.hpp | 2 +- nano/rpc_test/rpc.cpp | 32 ++++++++++++++++---------------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/nano/core_test/bootstrap.cpp b/nano/core_test/bootstrap.cpp index b04b41b8..ea5ad1a4 100644 --- a/nano/core_test/bootstrap.cpp +++ b/nano/core_test/bootstrap.cpp @@ -268,8 +268,8 @@ TEST (bootstrap_processor, process_state) node0->work_generate_blocking (*block1); node0->work_generate_blocking (*block2); - node0->process (*block1); - node0->process (*block2); + ASSERT_EQ (nano::process_result::progress, node0->process (*block1).code); + ASSERT_EQ (nano::process_result::progress, node0->process (*block2).code); auto node1 (std::make_shared (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work, node_flags)); ASSERT_EQ (node0->latest (nano::dev::genesis_key.pub), block2->hash ()); diff --git a/nano/core_test/election.cpp b/nano/core_test/election.cpp index 386eb469..397c61cd 100644 --- a/nano/core_test/election.cpp +++ b/nano/core_test/election.cpp @@ -219,16 +219,16 @@ TEST (election, quorum_minimum_update_weight_before_quorum_checks) node1.work_generate_blocking (*send2); node1.process_active (send1); node1.block_processor.flush (); - node1.process (*open1); - node1.process (*send2); + ASSERT_EQ (nano::process_result::progress, node1.process (*open1).code); + ASSERT_EQ (nano::process_result::progress, node1.process (*send2).code); node1.block_processor.flush (); ASSERT_EQ (node1.ledger.cache.block_count, 4); node_config.peering_port = nano::get_available_port (); auto & node2 = *system.add_node (node_config); - node2.process (*send1); - node2.process (*open1); - node2.process (*send2); + ASSERT_EQ (nano::process_result::progress, node2.process (*send1).code); + ASSERT_EQ (nano::process_result::progress, node2.process (*open1).code); + ASSERT_EQ (nano::process_result::progress, node2.process (*send2).code); system.wallet (1)->insert_adhoc (key1.prv); node2.block_processor.flush (); ASSERT_EQ (node2.ledger.cache.block_count, 4); diff --git a/nano/core_test/gap_cache.cpp b/nano/core_test/gap_cache.cpp index 88b77da5..3bd70273 100644 --- a/nano/core_test/gap_cache.cpp +++ b/nano/core_test/gap_cache.cpp @@ -68,7 +68,7 @@ TEST (gap_cache, gap_bootstrap) nano::block_hash latest (node1.latest (nano::dev::genesis_key.pub)); nano::keypair key; auto send (std::make_shared (latest, key.pub, nano::dev::constants.genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest))); - node1.process (*send); + ASSERT_EQ (nano::process_result::progress, node1.process (*send).code); ASSERT_EQ (nano::dev::constants.genesis_amount - 100, node1.balance (nano::dev::genesis->account ())); ASSERT_EQ (nano::dev::constants.genesis_amount, node2.balance (nano::dev::genesis->account ())); // Confirm send block, allowing voting on the upcoming block diff --git a/nano/node/node.hpp b/nano/node/node.hpp index a6e4c508..6a0ae59e 100644 --- a/nano/node/node.hpp +++ b/nano/node/node.hpp @@ -103,7 +103,7 @@ public: void process_confirmed_data (nano::transaction const &, std::shared_ptr const &, nano::block_hash const &, nano::account &, nano::uint128_t &, bool &, bool &, nano::account &); void process_confirmed (nano::election_status const &, uint64_t = 0); void process_active (std::shared_ptr const &); - nano::process_return process (nano::block &); + [[nodiscard]] nano::process_return process (nano::block &); nano::process_return process_local (std::shared_ptr const &); void process_local_async (std::shared_ptr const &); void keepalive_preconfigured (std::vector const &); diff --git a/nano/rpc_test/rpc.cpp b/nano/rpc_test/rpc.cpp index 24897824..36d911ef 100644 --- a/nano/rpc_test/rpc.cpp +++ b/nano/rpc_test/rpc.cpp @@ -2877,7 +2877,7 @@ TEST (rpc, republish) system.add_node (); auto latest (node1->latest (nano::dev::genesis_key.pub)); nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); - node1->process (send); + ASSERT_EQ (nano::process_result::progress, node1->process (send).code); nano::open_block open (send.hash (), key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node1->process (open).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); @@ -3456,7 +3456,7 @@ TEST (rpc, wallet_republish) system.wallet (0)->insert_adhoc (key.prv); auto latest (node1->latest (nano::dev::genesis_key.pub)); nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); - node1->process (send); + ASSERT_EQ (nano::process_result::progress, node1->process (send).code); nano::open_block open (send.hash (), key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node1->process (open).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); @@ -3485,7 +3485,7 @@ TEST (rpc, delegators) system.wallet (0)->insert_adhoc (key.prv); auto latest (node1->latest (nano::dev::genesis_key.pub)); nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); - node1->process (send); + ASSERT_EQ (nano::process_result::progress, node1->process (send).code); nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node1->process (open).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); @@ -3511,7 +3511,7 @@ TEST (rpc, delegators_parameters) nano::keypair key; auto latest (node1->latest (nano::dev::genesis_key.pub)); nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); - node1->process (send); + ASSERT_EQ (nano::process_result::progress, node1->process (send).code); nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node1->process (open).code); @@ -3606,7 +3606,7 @@ TEST (rpc, delegators_count) system.wallet (0)->insert_adhoc (key.prv); auto latest (node1->latest (nano::dev::genesis_key.pub)); nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); - node1->process (send); + ASSERT_EQ (nano::process_result::progress, node1->process (send).code); nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node1->process (open).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); @@ -3644,7 +3644,7 @@ TEST (rpc, account_info) system.wallet (0)->insert_adhoc (key.prv); auto latest (node1->latest (nano::dev::genesis_key.pub)); nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); - node1->process (send); + ASSERT_EQ (nano::process_result::progress, node1->process (send).code); auto time (nano::seconds_since_epoch ()); { auto transaction = node1->store.tx_begin_write (); @@ -3700,15 +3700,15 @@ TEST (rpc, account_info) { latest = node1->latest (nano::dev::genesis_key.pub); nano::send_block send1 (latest, key1.pub, 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); - node1->process (send1); + ASSERT_EQ (nano::process_result::progress, node1->process (send1).code); nano::send_block send2 (send1.hash (), key1.pub, 25, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (send1.hash ())); - node1->process (send2); + ASSERT_EQ (nano::process_result::progress, node1->process (send2).code); nano::state_block state_change (nano::dev::genesis_key.pub, send2.hash (), key1.pub, 25, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (send2.hash ())); - node1->process (state_change); + ASSERT_EQ (nano::process_result::progress, node1->process (state_change).code); nano::open_block open (send1.hash (), nano::dev::genesis_key.pub, key1.pub, key1.prv, key1.pub, *node1->work_generate_blocking (key1.pub)); - node1->process (open); + ASSERT_EQ (nano::process_result::progress, node1->process (open).code); } rpc_ctx->io_scope->renew (); @@ -3811,7 +3811,7 @@ TEST (rpc, json_block_output) nano::keypair key; auto latest (node1->latest (nano::dev::genesis_key.pub)); nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); - node1->process (send); + ASSERT_EQ (nano::process_result::progress, node1->process (send).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; request.put ("action", "block_info"); @@ -3944,7 +3944,7 @@ TEST (rpc, block_info_successor) nano::keypair key; auto latest (node1->latest (nano::dev::genesis_key.pub)); nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); - node1->process (send); + ASSERT_EQ (nano::process_result::progress, node1->process (send).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; request.put ("action", "block_info"); @@ -4096,7 +4096,7 @@ TEST (rpc, ledger) auto send_amount (genesis_balance - 100); genesis_balance -= send_amount; nano::send_block send (latest, key.pub, genesis_balance, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (latest)); - node->process (send); + ASSERT_EQ (nano::process_result::progress, node->process (send).code); nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *node->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node->process (open).code); auto time (nano::seconds_since_epoch ()); @@ -4166,7 +4166,7 @@ TEST (rpc, ledger) genesis_balance -= send2_amount; nano::send_block send2 (send.hash (), key.pub, genesis_balance, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (send.hash ())); rpc_ctx->io_scope->reset (); - node->process (send2); + ASSERT_EQ (nano::process_result::progress, node->process (send2).code); rpc_ctx->io_scope->renew (); // When asking for pending, pending amount is taken into account for threshold so the account must show up request.put ("count", 2); @@ -4240,7 +4240,7 @@ TEST (rpc, block_create) auto send_block (nano::deserialize_block_json (block_l)); ASSERT_EQ (send.hash (), send_block->hash ()); rpc_ctx->io_scope->reset (); - node1->process (send); + ASSERT_EQ (nano::process_result::progress, node1->process (send).code); rpc_ctx->io_scope->renew (); boost::property_tree::ptree request1; request1.put ("action", "block_create"); @@ -4618,7 +4618,7 @@ TEST (rpc, wallet_ledger) system.wallet (0)->insert_adhoc (key.prv); auto latest (node1->latest (nano::dev::genesis_key.pub)); nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); - node1->process (send); + ASSERT_EQ (nano::process_result::progress, node1->process (send).code); nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node1->process (open).code); auto time (nano::seconds_since_epoch ());