diff --git a/nano/load_test/entry.cpp b/nano/load_test/entry.cpp index e9e50ee6c..0bd41cb86 100644 --- a/nano/load_test/entry.cpp +++ b/nano/load_test/entry.cpp @@ -163,7 +163,7 @@ boost::property_tree::ptree rpc_request (boost::property_tree::ptree const & req debug_assert (results.size () == 1); std::promise> promise; - boost::asio::spawn (boost::asio::io_context::strand (ioc), [&ioc, &results, request, &promise](boost::asio::yield_context yield) { + boost::asio::spawn (ioc, [&ioc, &results, request, &promise](boost::asio::yield_context yield) { socket_type socket (ioc); boost::beast::flat_buffer buffer; http::request req; @@ -457,7 +457,7 @@ int main (int argc, char * const * argv) } // Send from genesis account to different accounts and receive the funds - boost::asio::spawn (boost::asio::io_context::strand (ioc), [&ioc, &primary_node_results, &wallet, &resolver, &node_count, destination_account, &send_calls_remaining](boost::asio::yield_context yield) { + boost::asio::spawn (ioc, [&ioc, &primary_node_results, &wallet, destination_account, &send_calls_remaining](boost::asio::yield_context yield) { send_receive (ioc, wallet, nano::genesis_account.to_account (), destination_account->as_string, send_calls_remaining, primary_node_results, yield); }); } diff --git a/nano/nano_node/entry.cpp b/nano/nano_node/entry.cpp index 9b7847188..8d47b1139 100644 --- a/nano/nano_node/entry.cpp +++ b/nano/nano_node/entry.cpp @@ -1008,7 +1008,6 @@ int main (int argc, char * const * argv) } } - uint64_t block_count (0); node->block_processor.flush (); auto end (std::chrono::high_resolution_clock::now ()); auto time (std::chrono::duration_cast (end - begin).count ()); diff --git a/nano/node/active_transactions.cpp b/nano/node/active_transactions.cpp index 2427f4860..f9063ed99 100644 --- a/nano/node/active_transactions.cpp +++ b/nano/node/active_transactions.cpp @@ -83,7 +83,6 @@ bool nano::active_transactions::insert_election_from_frontiers_confirmation (std nano::frontiers_confirmation_info nano::active_transactions::get_frontiers_confirmation_info () { // Limit maximum count of elections to start - nano::frontiers_confirmation_info frontiers_confirmation_info; auto rep_counts (node.wallets.reps ()); bool representative (node.config.enable_voting && rep_counts.voting > 0); bool half_princpal_representative (representative && rep_counts.half_principal > 0); diff --git a/nano/node/rocksdb/rocksdb.cpp b/nano/node/rocksdb/rocksdb.cpp index ccc01ee52..b95e9cff4 100644 --- a/nano/node/rocksdb/rocksdb.cpp +++ b/nano/node/rocksdb/rocksdb.cpp @@ -64,10 +64,10 @@ void rocksdb_val::convert_buffer_to_value () } nano::rocksdb_store::rocksdb_store (nano::logger_mt & logger_a, boost::filesystem::path const & path_a, nano::rocksdb_config const & rocksdb_config_a, bool open_read_only_a) : -logger (logger_a), -rocksdb_config (rocksdb_config_a), -cf_name_table_map (create_cf_name_table_map ()), -max_block_write_batch_num_m (nano::narrow_cast (blocks_memtable_size_bytes () / (2 * (sizeof (nano::block_type) + nano::state_block::size + nano::block_sideband::size (nano::block_type::state))))) +logger{ logger_a }, +rocksdb_config{ rocksdb_config_a }, +max_block_write_batch_num_m{ nano::narrow_cast (blocks_memtable_size_bytes () / (2 * (sizeof (nano::block_type) + nano::state_block::size + nano::block_sideband::size (nano::block_type::state)))) }, +cf_name_table_map{ create_cf_name_table_map () } { boost::system::error_code error_mkdir, error_chmod; boost::filesystem::create_directories (path_a, error_mkdir); @@ -160,8 +160,6 @@ rocksdb::ColumnFamilyOptions nano::rocksdb_store::get_common_cf_options (std::sh rocksdb::ColumnFamilyOptions cf_options; cf_options.table_factory = table_factory_a; - auto write_buffer_size = memtable_size_bytes_a; - // (1 active, 1 inactive) auto num_memtables = 2; diff --git a/nano/node/rocksdb/rocksdb_iterator.hpp b/nano/node/rocksdb/rocksdb_iterator.hpp index 3da45556a..dc3c73866 100644 --- a/nano/node/rocksdb/rocksdb_iterator.hpp +++ b/nano/node/rocksdb/rocksdb_iterator.hpp @@ -36,7 +36,6 @@ public: rocksdb_iterator (rocksdb::DB * db, nano::transaction const & transaction_a, rocksdb::ColumnFamilyHandle * handle_a, rocksdb_val const * val_a) { // Don't fill the block cache for any blocks read as a result of an iterator - rocksdb::Iterator * iter; if (is_read (transaction_a)) { auto & read_options = snapshot_options (transaction_a); diff --git a/nano/node/voting.cpp b/nano/node/voting.cpp index 503df8953..5c9e3a814 100644 --- a/nano/node/voting.cpp +++ b/nano/node/voting.cpp @@ -171,7 +171,7 @@ size_t nano::vote_generator::generate (std::vector> request_t::first_type candidates; { auto transaction (ledger.store.tx_begin_read ()); - auto dependents_confirmed = [&blocks_a, &transaction, this](auto const & block_a) { + auto dependents_confirmed = [&transaction, this](auto const & block_a) { return this->ledger.dependents_confirmed (transaction, *block_a); }; auto as_candidate = [](auto const & block_a) { @@ -282,7 +282,7 @@ void nano::vote_generator::vote (std::vector const & hashes_a, std::vector> votes_l; { auto transaction (ledger.store.tx_begin_read ()); - wallets.foreach_representative ([this, &hashes_a, &roots_a, &transaction, &votes_l](nano::public_key const & pub_a, nano::raw_key const & prv_a) { + wallets.foreach_representative ([this, &hashes_a, &transaction, &votes_l](nano::public_key const & pub_a, nano::raw_key const & prv_a) { votes_l.emplace_back (this->ledger.store.vote_generate (transaction, pub_a, prv_a, hashes_a)); }); }