Moving store.hpp to component.hpp

nano/core_test/processor_service.cpp

@@ -2,8 +2,8 @@
 #include <nano/lib/work.hpp>
 #include <nano/node/make_store.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
 #include <nano/secure/utility.hpp>
+#include <nano/store/component.hpp>
 #include <nano/test_common/testutil.hpp>
 
 #include <gtest/gtest.h>

nano/lib/rep_weights.cpp

@@ -1,5 +1,5 @@
 #include <nano/lib/rep_weights.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 void nano::rep_weights::representation_add (nano::account const & source_rep_a, nano::uint128_t const & amount_a)
 {

nano/node/active_transactions.cpp

@@ -7,7 +7,7 @@
 #include <nano/node/repcrawler.hpp>
 #include <nano/node/scheduler/component.hpp>
 #include <nano/node/scheduler/priority.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/format.hpp>
 

nano/node/backlog_population.cpp

@@ -2,7 +2,7 @@
 #include <nano/node/backlog_population.hpp>
 #include <nano/node/nodeconfig.hpp>
 #include <nano/node/scheduler/priority.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 nano::backlog_population::backlog_population (const config & config_a, nano::store & store_a, nano::stats & stats_a) :
 	config_m{ config_a },

nano/node/blockprocessor.cpp

@@ -2,7 +2,7 @@
 #include <nano/lib/timer.hpp>
 #include <nano/node/blockprocessor.hpp>
 #include <nano/node/node.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/format.hpp>
 

nano/node/bootstrap/bootstrap_server.cpp

@@ -2,7 +2,7 @@
 #include <nano/node/transport/channel.hpp>
 #include <nano/node/transport/transport.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 // TODO: Make threads configurable
 nano::bootstrap_server::bootstrap_server (nano::store & store_a, nano::ledger & ledger_a, nano::network_constants const & network_constants_a, nano::stats & stats_a) :

nano/node/bootstrap_ascending/iterators.cpp

@@ -1,7 +1,7 @@
 #include <nano/lib/utility.hpp>
 #include <nano/node/bootstrap_ascending/iterators.hpp>
 #include <nano/secure/common.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 /*
  * database_iterator

nano/node/bootstrap_ascending/service.cpp

@@ -6,7 +6,7 @@
 #include <nano/node/transport/transport.hpp>
 #include <nano/secure/common.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 using namespace std::chrono_literals;
 

nano/node/confirmation_height_bounded.hpp

@@ -4,7 +4,7 @@
 #include <nano/lib/relaxed_atomic.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/lib/timer.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/circular_buffer.hpp>
 

nano/node/confirmation_height_processor.hpp

@@ -5,7 +5,7 @@
 #include <nano/node/confirmation_height_bounded.hpp>
 #include <nano/node/confirmation_height_unbounded.hpp>
 #include <nano/secure/common.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/mem_fun.hpp>

nano/node/confirmation_height_unbounded.hpp

@@ -4,7 +4,7 @@
 #include <nano/lib/relaxed_atomic.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/lib/timer.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <chrono>
 #include <unordered_map>

nano/node/election.hpp

@@ -2,7 +2,7 @@
 
 #include <nano/secure/common.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <atomic>
 #include <chrono>

nano/node/gap_cache.cpp

@@ -1,6 +1,6 @@
 #include <nano/node/gap_cache.hpp>
 #include <nano/node/node.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/format.hpp>
 

nano/node/ledger_walker.cpp

@@ -5,8 +5,8 @@
 #include <nano/lib/errors.hpp>
 #include <nano/node/ledger_walker.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
 #include <nano/secure/utility.hpp>
+#include <nano/store/component.hpp>
 
 #include <algorithm>
 #include <limits>

nano/node/lmdb/account_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 

nano/node/lmdb/block_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 

nano/node/lmdb/confirmation_height_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 

nano/node/lmdb/final_vote_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 

nano/node/lmdb/frontier_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 

nano/node/lmdb/lmdb_env.hpp

@@ -2,7 +2,7 @@
 
 #include <nano/lib/lmdbconfig.hpp>
 #include <nano/node/lmdb/lmdb_txn.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {

nano/node/lmdb/lmdb_iterator.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 

nano/node/lmdb/lmdb_txn.cpp

@@ -4,7 +4,7 @@
 #include <nano/lib/utility.hpp>
 #include <nano/node/lmdb/lmdb_env.hpp>
 #include <nano/node/lmdb/lmdb_txn.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/format.hpp>
 

nano/node/lmdb/lmdb_txn.hpp

@@ -2,7 +2,7 @@
 
 #include <nano/lib/diagnosticsconfig.hpp>
 #include <nano/lib/timer.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/property_tree/ptree_fwd.hpp>
 #include <boost/stacktrace/stacktrace_fwd.hpp>

nano/node/lmdb/online_weight_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 

nano/node/lmdb/peer_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 

nano/node/lmdb/pending_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 

nano/node/lmdb/pruned_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 

nano/node/lmdb/version_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {

nano/node/lmdb/wallet_value.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <nano/lib/numbers.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 

nano/node/online_reps.cpp

@@ -1,7 +1,7 @@
 #include <nano/node/nodeconfig.hpp>
 #include <nano/node/online_reps.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 nano::online_reps::online_reps (nano::ledger & ledger_a, nano::node_config const & config_a) :
 	ledger{ ledger_a },

nano/node/process_live_dispatcher.cpp

@@ -6,7 +6,7 @@
 #include <nano/node/websocket.hpp>
 #include <nano/secure/common.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 nano::process_live_dispatcher::process_live_dispatcher (nano::ledger & ledger, nano::scheduler::priority & scheduler, nano::vote_cache & inactive_vote_cache, nano::websocket_server & websocket) :
 	ledger{ ledger },

nano/node/request_aggregator.cpp

@@ -8,7 +8,7 @@
 #include <nano/node/voting.hpp>
 #include <nano/node/wallet.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 nano::request_aggregator::request_aggregator (nano::node_config const & config_a, nano::stats & stats_a, nano::vote_generator & generator_a, nano::vote_generator & final_generator_a, nano::local_vote_history & history_a, nano::ledger & ledger_a, nano::wallets & wallets_a, nano::active_transactions & active_a) :
 	config{ config_a },

nano/node/rocksdb/account_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {

nano/node/rocksdb/block_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <rocksdb/slice.h>
 

nano/node/rocksdb/confirmation_height_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {

nano/node/rocksdb/final_vote_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {

nano/node/rocksdb/frontier_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {

nano/node/rocksdb/online_weight_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {

nano/node/rocksdb/peer_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {

nano/node/rocksdb/pending_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {

nano/node/rocksdb/pruned_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {

nano/node/rocksdb/rocksdb_iterator.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <rocksdb/db.h>
 #include <rocksdb/filter_policy.h>

nano/node/rocksdb/rocksdb_txn.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <rocksdb/db.h>
 #include <rocksdb/options.h>

nano/node/rocksdb/version_store.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {

nano/node/voting.cpp

@@ -8,7 +8,7 @@
 #include <nano/node/voting.hpp>
 #include <nano/node/wallet.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <chrono>
 

nano/node/wallet.hpp

@@ -7,7 +7,7 @@
 #include <nano/node/lmdb/wallet_value.hpp>
 #include <nano/node/openclwork.hpp>
 #include <nano/secure/common.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <atomic>
 #include <mutex>

nano/secure/CMakeLists.txt

@@ -39,7 +39,6 @@ add_library(
   ${PLATFORM_SECURE_SOURCE}
   ${CMAKE_BINARY_DIR}/bootstrap_weights_live.cpp
   ${CMAKE_BINARY_DIR}/bootstrap_weights_beta.cpp
-  store.hpp
   store.cpp
   buffer.hpp
   common.hpp

nano/secure/common.cpp

@@ -3,7 +3,7 @@
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/timer.hpp>
 #include <nano/secure/common.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/endian/conversion.hpp>
 #include <boost/property_tree/json_parser.hpp>

nano/secure/ledger.cpp

@@ -5,7 +5,7 @@
 #include <nano/node/make_store.hpp>
 #include <nano/secure/common.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/filesystem.hpp>
 

nano/secure/store.cpp

@@ -1,6 +1,6 @@
 #include <nano/lib/thread_roles.hpp>
 #include <nano/lib/timer.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 nano::read_transaction::read_transaction (std::unique_ptr<nano::read_transaction_impl> read_transaction_impl) :
 	impl (std::move (read_transaction_impl))