diff --git a/nano/node/cli.cpp b/nano/node/cli.cpp index 75ec166243..91b3286ba9 100644 --- a/nano/node/cli.cpp +++ b/nano/node/cli.cpp @@ -121,7 +121,6 @@ void nano::add_node_flag_options (boost::program_options::options_description & ("block_processor_verification_size", boost::program_options::value(), "Increase batch signature verification size in block processor, default 0 (limited by config signature_checker_threads), unlimited for fast_bootstrap") ("inactive_votes_cache_size", boost::program_options::value(), "Increase cached votes without active elections size, default 16384") ("vote_processor_capacity", boost::program_options::value(), "Vote processor queue size before dropping votes, default 144k") - ("disable_large_votes", boost::program_options::value(), "Disable large votes") ; // clang-format on } @@ -182,12 +181,6 @@ std::error_code nano::update_flags (nano::node_flags & flags_a, boost::program_o { flags_a.vote_processor_capacity = vote_processor_capacity_it->second.as (); } - auto disable_large_votes_it = vm.find ("disable_large_votes"); - if (disable_large_votes_it != vm.end ()) - { - nano::network::confirm_req_hashes_max = 7; - nano::network::confirm_ack_hashes_max = 12; - } // Config overriding auto config (vm.find ("config")); if (config != vm.end ()) diff --git a/nano/node/network.cpp b/nano/node/network.cpp index 5073cf35e3..4b876fecd5 100644 --- a/nano/node/network.cpp +++ b/nano/node/network.cpp @@ -11,10 +11,6 @@ using namespace std::chrono_literals; -// TODO: Return to static const and remove "disable_large_votes" when rolled out -std::size_t nano::network::confirm_req_hashes_max{ 255 }; -std::size_t nano::network::confirm_ack_hashes_max{ 255 }; - /* * network */ diff --git a/nano/node/network.hpp b/nano/node/network.hpp index e33cbd5f06..2ba0aac407 100644 --- a/nano/node/network.hpp +++ b/nano/node/network.hpp @@ -173,8 +173,8 @@ class network final static unsigned const broadcast_interval_ms = 10; static std::size_t const buffer_size = 512; - static std::size_t confirm_req_hashes_max; - static std::size_t confirm_ack_hashes_max; + static const std::size_t confirm_req_hashes_max = 255; + static const std::size_t confirm_ack_hashes_max = 255; }; std::unique_ptr collect_container_info (network & network, std::string const & name);