dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add [[nodiscard]] attribute to node::process method (#3505)

Browse source 
* Add [[nodiscard]] attribute to node::process method
This commit is contained in:
theohax 2021-10-16 07:44:03 +03:00 • committed by GitHub
commit 7b5e4d75f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nano/core_test/bootstrap.cpp
View file

@ -268,8 +268,8 @@ TEST (bootstrap_processor, process_state)
node0->work_generate_blocking (*block1); node0->work_generate_blocking (*block1);
node0->work_generate_blocking (*block2); node0->work_generate_blocking (*block2);
node0->process (*block1); ASSERT_EQ (nano::process_result::progress, node0->process (*block1).code);
node0->process (*block2); ASSERT_EQ (nano::process_result::progress, node0->process (*block2).code);
auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work, node_flags)); auto node1 (std::make_shared<nano::node> (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 ()); ASSERT_EQ (node0->latest (nano::dev::genesis_key.pub), block2->hash ());

10
nano/core_test/election.cpp
View file

@ -219,16 +219,16 @@ TEST (election, quorum_minimum_update_weight_before_quorum_checks)
node1.work_generate_blocking (*send2); node1.work_generate_blocking (*send2);
node1.process_active (send1); node1.process_active (send1);
node1.block_processor.flush (); node1.block_processor.flush ();
node1.process (*open1); ASSERT_EQ (nano::process_result::progress, node1.process (*open1).code);
node1.process (*send2); ASSERT_EQ (nano::process_result::progress, node1.process (*send2).code);
node1.block_processor.flush (); node1.block_processor.flush ();
ASSERT_EQ (node1.ledger.cache.block_count, 4); ASSERT_EQ (node1.ledger.cache.block_count, 4);
node_config.peering_port = nano::get_available_port (); node_config.peering_port = nano::get_available_port ();
auto & node2 = *system.add_node (node_config); auto & node2 = *system.add_node (node_config);
node2.process (*send1); ASSERT_EQ (nano::process_result::progress, node2.process (*send1).code);
node2.process (*open1); ASSERT_EQ (nano::process_result::progress, node2.process (*open1).code);
node2.process (*send2); ASSERT_EQ (nano::process_result::progress, node2.process (*send2).code);
system.wallet (1)->insert_adhoc (key1.prv); system.wallet (1)->insert_adhoc (key1.prv);
node2.block_processor.flush (); node2.block_processor.flush ();
ASSERT_EQ (node2.ledger.cache.block_count, 4); ASSERT_EQ (node2.ledger.cache.block_count, 4);

2
nano/core_test/gap_cache.cpp
View file

@ -68,7 +68,7 @@ TEST (gap_cache, gap_bootstrap)
nano::block_hash latest (node1.latest (nano::dev::genesis_key.pub)); nano::block_hash latest (node1.latest (nano::dev::genesis_key.pub));
nano::keypair key; nano::keypair key;
auto send (std::make_shared<nano::send_block> (latest, key.pub, nano::dev::constants.genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest))); auto send (std::make_shared<nano::send_block> (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 - 100, node1.balance (nano::dev::genesis->account ()));
ASSERT_EQ (nano::dev::constants.genesis_amount, node2.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 // Confirm send block, allowing voting on the upcoming block

2
nano/node/node.hpp
View file

@ -103,7 +103,7 @@ public:
void process_confirmed_data (nano::transaction const &, std::shared_ptr<nano::block> const &, nano::block_hash const &, nano::account &, nano::uint128_t &, bool &, bool &, nano::account &); void process_confirmed_data (nano::transaction const &, std::shared_ptr<nano::block> 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_confirmed (nano::election_status const &, uint64_t = 0);
void process_active (std::shared_ptr<nano::block> const &); void process_active (std::shared_ptr<nano::block> const &);
nano::process_return process (nano::block &); [[nodiscard]] nano::process_return process (nano::block &);
nano::process_return process_local (std::shared_ptr<nano::block> const &); nano::process_return process_local (std::shared_ptr<nano::block> const &);
void process_local_async (std::shared_ptr<nano::block> const &); void process_local_async (std::shared_ptr<nano::block> const &);
void keepalive_preconfigured (std::vector<std::string> const &); void keepalive_preconfigured (std::vector<std::string> const &);

32
nano/rpc_test/rpc.cpp
View file

@ -2877,7 +2877,7 @@ TEST (rpc, republish)
system.add_node (); system.add_node ();
auto latest (node1->latest (nano::dev::genesis_key.pub)); 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)); 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)); 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); ASSERT_EQ (nano::process_result::progress, node1->process (open).code);
auto [rpc, rpc_ctx] = add_rpc (system, node1); auto [rpc, rpc_ctx] = add_rpc (system, node1);
@ -3456,7 +3456,7 @@ TEST (rpc, wallet_republish)
system.wallet (0)->insert_adhoc (key.prv); system.wallet (0)->insert_adhoc (key.prv);
auto latest (node1->latest (nano::dev::genesis_key.pub)); 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)); 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)); 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); ASSERT_EQ (nano::process_result::progress, node1->process (open).code);
auto [rpc, rpc_ctx] = add_rpc (system, node1); auto [rpc, rpc_ctx] = add_rpc (system, node1);
@ -3485,7 +3485,7 @@ TEST (rpc, delegators)
system.wallet (0)->insert_adhoc (key.prv); system.wallet (0)->insert_adhoc (key.prv);
auto latest (node1->latest (nano::dev::genesis_key.pub)); 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)); 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)); 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); ASSERT_EQ (nano::process_result::progress, node1->process (open).code);
auto [rpc, rpc_ctx] = add_rpc (system, node1); auto [rpc, rpc_ctx] = add_rpc (system, node1);
@ -3511,7 +3511,7 @@ TEST (rpc, delegators_parameters)
nano::keypair key; nano::keypair key;
auto latest (node1->latest (nano::dev::genesis_key.pub)); 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)); 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)); 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); 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); system.wallet (0)->insert_adhoc (key.prv);
auto latest (node1->latest (nano::dev::genesis_key.pub)); 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)); 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)); 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); ASSERT_EQ (nano::process_result::progress, node1->process (open).code);
auto [rpc, rpc_ctx] = add_rpc (system, node1); auto [rpc, rpc_ctx] = add_rpc (system, node1);
@ -3644,7 +3644,7 @@ TEST (rpc, account_info)
system.wallet (0)->insert_adhoc (key.prv); system.wallet (0)->insert_adhoc (key.prv);
auto latest (node1->latest (nano::dev::genesis_key.pub)); 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)); 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 time (nano::seconds_since_epoch ());
{ {
auto transaction = node1->store.tx_begin_write (); auto transaction = node1->store.tx_begin_write ();
@ -3700,15 +3700,15 @@ TEST (rpc, account_info)
{ {
latest = node1->latest (nano::dev::genesis_key.pub); 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)); 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 ())); 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 ())); 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)); 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 (); rpc_ctx->io_scope->renew ();
@ -3811,7 +3811,7 @@ TEST (rpc, json_block_output)
nano::keypair key; nano::keypair key;
auto latest (node1->latest (nano::dev::genesis_key.pub)); 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)); 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); auto [rpc, rpc_ctx] = add_rpc (system, node1);
boost::property_tree::ptree request; boost::property_tree::ptree request;
request.put ("action", "block_info"); request.put ("action", "block_info");
@ -3944,7 +3944,7 @@ TEST (rpc, block_info_successor)
nano::keypair key; nano::keypair key;
auto latest (node1->latest (nano::dev::genesis_key.pub)); 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)); 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); auto [rpc, rpc_ctx] = add_rpc (system, node1);
boost::property_tree::ptree request; boost::property_tree::ptree request;
request.put ("action", "block_info"); request.put ("action", "block_info");
@ -4096,7 +4096,7 @@ TEST (rpc, ledger)
auto send_amount (genesis_balance - 100); auto send_amount (genesis_balance - 100);
genesis_balance -= send_amount; 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)); 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)); 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); ASSERT_EQ (nano::process_result::progress, node->process (open).code);
auto time (nano::seconds_since_epoch ()); auto time (nano::seconds_since_epoch ());
@ -4166,7 +4166,7 @@ TEST (rpc, ledger)
genesis_balance -= send2_amount; 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 ())); 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 (); rpc_ctx->io_scope->reset ();
node->process (send2); ASSERT_EQ (nano::process_result::progress, node->process (send2).code);
rpc_ctx->io_scope->renew (); rpc_ctx->io_scope->renew ();
// When asking for pending, pending amount is taken into account for threshold so the account must show up // When asking for pending, pending amount is taken into account for threshold so the account must show up
request.put ("count", 2); request.put ("count", 2);
@ -4240,7 +4240,7 @@ TEST (rpc, block_create)
auto send_block (nano::deserialize_block_json (block_l)); auto send_block (nano::deserialize_block_json (block_l));
ASSERT_EQ (send.hash (), send_block->hash ()); ASSERT_EQ (send.hash (), send_block->hash ());
rpc_ctx->io_scope->reset (); rpc_ctx->io_scope->reset ();
node1->process (send); ASSERT_EQ (nano::process_result::progress, node1->process (send).code);
rpc_ctx->io_scope->renew (); rpc_ctx->io_scope->renew ();
boost::property_tree::ptree request1; boost::property_tree::ptree request1;
request1.put ("action", "block_create"); request1.put ("action", "block_create");
@ -4618,7 +4618,7 @@ TEST (rpc, wallet_ledger)
system.wallet (0)->insert_adhoc (key.prv); system.wallet (0)->insert_adhoc (key.prv);
auto latest (node1->latest (nano::dev::genesis_key.pub)); 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)); 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)); 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); ASSERT_EQ (nano::process_result::progress, node1->process (open).code);
auto time (nano::seconds_since_epoch ()); auto time (nano::seconds_since_epoch ());