diff --git a/nano/core_test/message_parser.cpp b/nano/core_test/message_parser.cpp index d81050e9..0bf62f22 100644 --- a/nano/core_test/message_parser.cpp +++ b/nano/core_test/message_parser.cpp @@ -67,8 +67,7 @@ TEST (message_parser, exact_confirm_ack_size) nano::network_filter filter (1); nano::block_uniquer block_uniquer; nano::vote_uniquer vote_uniquer (block_uniquer); - nano::network_constants network; - nano::message_parser parser (filter, block_uniquer, vote_uniquer, visitor, system.work, network); + nano::message_parser parser (filter, block_uniquer, vote_uniquer, visitor, system.work, nano::dev::network_params.network); auto block (std::make_shared (1, 1, 2, nano::keypair ().prv, 4, *system.work.generate (nano::root (1)))); auto vote (std::make_shared (0, nano::keypair ().prv, 0, std::move (block))); nano::confirm_ack message{ nano::dev::network_params.network, vote }; @@ -102,8 +101,7 @@ TEST (message_parser, exact_confirm_req_size) nano::network_filter filter (1); nano::block_uniquer block_uniquer; nano::vote_uniquer vote_uniquer (block_uniquer); - nano::network_constants network; - nano::message_parser parser (filter, block_uniquer, vote_uniquer, visitor, system.work, network); + nano::message_parser parser (filter, block_uniquer, vote_uniquer, visitor, system.work, nano::dev::network_params.network); auto block (std::make_shared (1, 1, 2, nano::keypair ().prv, 4, *system.work.generate (nano::root (1)))); nano::confirm_req message{ nano::dev::network_params.network, block }; std::vector bytes; @@ -136,8 +134,7 @@ TEST (message_parser, exact_confirm_req_hash_size) nano::network_filter filter (1); nano::block_uniquer block_uniquer; nano::vote_uniquer vote_uniquer (block_uniquer); - nano::network_constants network; - nano::message_parser parser (filter, block_uniquer, vote_uniquer, visitor, system.work, network); + nano::message_parser parser (filter, block_uniquer, vote_uniquer, visitor, system.work, nano::dev::network_params.network); nano::send_block block (1, 1, 2, nano::keypair ().prv, 4, *system.work.generate (nano::root (1))); nano::confirm_req message{ nano::dev::network_params.network, block.hash (), block.root () }; std::vector bytes; @@ -170,8 +167,7 @@ TEST (message_parser, exact_publish_size) nano::network_filter filter (1); nano::block_uniquer block_uniquer; nano::vote_uniquer vote_uniquer (block_uniquer); - nano::network_constants network; - nano::message_parser parser (filter, block_uniquer, vote_uniquer, visitor, system.work, network); + nano::message_parser parser (filter, block_uniquer, vote_uniquer, visitor, system.work, nano::dev::network_params.network); auto block (std::make_shared (1, 1, 2, nano::keypair ().prv, 4, *system.work.generate (nano::root (1)))); nano::publish message{ nano::dev::network_params.network, block }; std::vector bytes; @@ -204,8 +200,7 @@ TEST (message_parser, exact_keepalive_size) nano::network_filter filter (1); nano::block_uniquer block_uniquer; nano::vote_uniquer vote_uniquer (block_uniquer); - nano::network_constants network; - nano::message_parser parser (filter, block_uniquer, vote_uniquer, visitor, system.work, network); + nano::message_parser parser (filter, block_uniquer, vote_uniquer, visitor, system.work, nano::dev::network_params.network); nano::keepalive message{ nano::dev::network_params.network }; std::vector bytes; { diff --git a/nano/core_test/system.cpp b/nano/core_test/system.cpp index 015a81dd..7ea6dd7d 100644 --- a/nano/core_test/system.cpp +++ b/nano/core_test/system.cpp @@ -10,9 +10,8 @@ TEST (system, work_generate_limited) { nano::system system; nano::block_hash key (1); - nano::network_constants constants; - auto min = constants.publish_thresholds.entry; - auto max = constants.publish_thresholds.base; + auto min = nano::dev::network_params.network.publish_thresholds.entry; + auto max = nano::dev::network_params.network.publish_thresholds.base; for (int i = 0; i < 5; ++i) { auto work = system.work_generate_limited (key, min, max); diff --git a/nano/core_test/work_pool.cpp b/nano/core_test/work_pool.cpp index f2bc1450..c7f7ed22 100644 --- a/nano/core_test/work_pool.cpp +++ b/nano/core_test/work_pool.cpp @@ -16,7 +16,6 @@ TEST (work, one) { - nano::network_constants network_constants; nano::work_pool pool{ nano::dev::network_params.network, std::numeric_limits::max () }; nano::change_block block (1, 1, nano::keypair ().prv, 3, 4); block.block_work_set (*pool.generate (block.root ())); @@ -25,7 +24,6 @@ TEST (work, one) TEST (work, disabled) { - nano::network_constants network_constants; nano::work_pool pool{ nano::dev::network_params.network, 0 }; auto result (pool.generate (nano::block_hash ())); ASSERT_FALSE (result.is_initialized ()); @@ -33,7 +31,6 @@ TEST (work, disabled) TEST (work, validate) { - nano::network_constants network_constants; nano::work_pool pool{ nano::dev::network_params.network, std::numeric_limits::max () }; nano::send_block send_block (1, 1, 2, nano::keypair ().prv, 4, 6); ASSERT_LT (send_block.difficulty (), nano::work_threshold_base (send_block.work_version ())); @@ -50,7 +47,7 @@ TEST (work, cancel) { nano::root key (1); pool.generate ( - nano::work_version::work_1, key, nano::network_constants ().publish_thresholds.base, [&done] (boost::optional work_a) { + nano::work_version::work_1, key, nano::dev::network_params.network.publish_thresholds.base, [&done] (boost::optional work_a) { done = !work_a; }); pool.cancel (key); @@ -68,13 +65,12 @@ TEST (work, cancel_many) nano::root key4 (1); nano::root key5 (3); nano::root key6 (1); - nano::network_constants constants; - pool.generate (nano::work_version::work_1, key1, constants.publish_thresholds.base, [] (boost::optional) {}); - pool.generate (nano::work_version::work_1, key2, constants.publish_thresholds.base, [] (boost::optional) {}); - pool.generate (nano::work_version::work_1, key3, constants.publish_thresholds.base, [] (boost::optional) {}); - pool.generate (nano::work_version::work_1, key4, constants.publish_thresholds.base, [] (boost::optional) {}); - pool.generate (nano::work_version::work_1, key5, constants.publish_thresholds.base, [] (boost::optional) {}); - pool.generate (nano::work_version::work_1, key6, constants.publish_thresholds.base, [] (boost::optional) {}); + pool.generate (nano::work_version::work_1, key1, nano::dev::network_params.network.publish_thresholds.base, [] (boost::optional) {}); + pool.generate (nano::work_version::work_1, key2, nano::dev::network_params.network.publish_thresholds.base, [] (boost::optional) {}); + pool.generate (nano::work_version::work_1, key3, nano::dev::network_params.network.publish_thresholds.base, [] (boost::optional) {}); + pool.generate (nano::work_version::work_1, key4, nano::dev::network_params.network.publish_thresholds.base, [] (boost::optional) {}); + pool.generate (nano::work_version::work_1, key5, nano::dev::network_params.network.publish_thresholds.base, [] (boost::optional) {}); + pool.generate (nano::work_version::work_1, key6, nano::dev::network_params.network.publish_thresholds.base, [] (boost::optional) {}); pool.cancel (key1); }