diff --git a/nano/core_test/gap_cache.cpp b/nano/core_test/gap_cache.cpp index 7a30cc4818..a09fc42961 100644 --- a/nano/core_test/gap_cache.cpp +++ b/nano/core_test/gap_cache.cpp @@ -61,7 +61,7 @@ TEST (gap_cache, gap_bootstrap) auto send (std::make_shared (latest, key.pub, nano::genesis_amount - 100, nano::test_genesis_key.prv, nano::test_genesis_key.pub, system.work.generate (latest))); { auto transaction (system.nodes[0]->store.tx_begin (true)); - ASSERT_EQ (nano::process_result::progress, system.nodes[0]->block_processor.process_receive_one (transaction, send).code); + ASSERT_EQ (nano::process_result::progress, system.nodes[0]->block_processor.process_one (transaction, send).code); } ASSERT_EQ (nano::genesis_amount - 100, system.nodes[0]->balance (nano::genesis_account)); ASSERT_EQ (nano::genesis_amount, system.nodes[1]->balance (nano::genesis_account)); diff --git a/nano/node/node.cpp b/nano/node/node.cpp index 37ce425c7f..424ead7d5d 100644 --- a/nano/node/node.cpp +++ b/nano/node/node.cpp @@ -1265,7 +1265,7 @@ void nano::block_processor::process_blocks () { active = true; lock.unlock (); - process_receive_many (lock); + process_batch (lock); lock.lock (); active = false; } @@ -1362,7 +1362,7 @@ void nano::block_processor::verify_state_blocks (std::unique_lock & } } -void nano::block_processor::process_receive_many (std::unique_lock & lock_a) +void nano::block_processor::process_batch (std::unique_lock & lock_a) { lock_a.lock (); auto start_time (std::chrono::steady_clock::now ()); @@ -1431,7 +1431,7 @@ void nano::block_processor::process_receive_many (std::unique_lock & /* Forced state blocks are not validated in verify_state_blocks () function Because of that we should set set validated_state_block as "false" for forced state blocks (!force) */ bool validated_state_block (!force && block.first->type () == nano::block_type::state); - auto process_result (process_receive_one (transaction, block.first, block.second, validated_state_block)); + auto process_result (process_one (transaction, block.first, block.second, validated_state_block)); number_of_blocks_processed++; (void)process_result; lock_a.lock (); @@ -1454,7 +1454,7 @@ void nano::block_processor::process_receive_many (std::unique_lock & } } -nano::process_return nano::block_processor::process_receive_one (nano::transaction const & transaction_a, std::shared_ptr block_a, std::chrono::steady_clock::time_point origination, bool validated_state_block) +nano::process_return nano::block_processor::process_one (nano::transaction const & transaction_a, std::shared_ptr block_a, std::chrono::steady_clock::time_point origination, bool validated_state_block) { nano::process_return result; auto hash (block_a->hash ()); @@ -2653,7 +2653,7 @@ void nano::node::process_confirmed (std::shared_ptr block_a) if (!exists) { auto transaction (store.tx_begin_write ()); - block_processor.process_receive_one (transaction, block_a); + block_processor.process_one (transaction, block_a); exists = store.block_exists (transaction, block_a->type (), hash); } if (exists) diff --git a/nano/node/node.hpp b/nano/node/node.hpp index fcfe59f99e..e1528627e6 100644 --- a/nano/node/node.hpp +++ b/nano/node/node.hpp @@ -425,12 +425,12 @@ class block_processor bool should_log (bool); bool have_blocks (); void process_blocks (); - nano::process_return process_receive_one (nano::transaction const &, std::shared_ptr, std::chrono::steady_clock::time_point = std::chrono::steady_clock::now (), bool = false); + nano::process_return process_one (nano::transaction const &, std::shared_ptr, std::chrono::steady_clock::time_point = std::chrono::steady_clock::now (), bool = false); private: void queue_unchecked (nano::transaction const &, nano::block_hash const &); void verify_state_blocks (std::unique_lock &, size_t = std::numeric_limits::max ()); - void process_receive_many (std::unique_lock &); + void process_batch (std::unique_lock &); bool stopped; bool active; std::chrono::steady_clock::time_point next_log; diff --git a/nano/node/rpc.cpp b/nano/node/rpc.cpp index 037c57a4a3..4e649f3623 100644 --- a/nano/node/rpc.cpp +++ b/nano/node/rpc.cpp @@ -2409,7 +2409,7 @@ void nano::rpc_handler::process () nano::process_return result; { auto transaction (node.store.tx_begin_write ()); - result = node.block_processor.process_receive_one (transaction, block, std::chrono::steady_clock::time_point ()); + result = node.block_processor.process_one (transaction, block, std::chrono::steady_clock::time_point ()); } switch (result.code) {