Skip to content

Commit

Permalink
Moving headers in to nano::store
Browse files Browse the repository at this point in the history
  • Loading branch information
@clemahieu
clemahieu committed Sep 20, 2023
1 parent eca4d95 commit 1e323ea
Show file tree
Hide file tree
Showing 68 changed files with 121 additions and 122 deletions.
6 changes: 3 additions & 3 deletions nano/core_test/block_store.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
#include <nano/lib/utility.hpp>
#include <nano/lib/work.hpp>
#include <nano/node/common.hpp>
#include <nano/node/lmdb/lmdb.hpp>
#include <nano/node/make_store.hpp>
#include <nano/node/rocksdb/rocksdb.hpp>
#include <nano/secure/ledger.hpp>
#include <nano/secure/utility.hpp>
#include <nano/secure/versioning.hpp>
#include <nano/store/lmdb/lmdb.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>
#include <nano/store/versioning.hpp>
#include <nano/test_common/system.hpp>
#include <nano/test_common/testutil.hpp>

Expand Down
2 changes: 1 addition & 1 deletion nano/core_test/ledger.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
#include <nano/lib/threading.hpp>
#include <nano/node/election.hpp>
#include <nano/node/make_store.hpp>
#include <nano/node/rocksdb/rocksdb.hpp>
#include <nano/node/scheduler/component.hpp>
#include <nano/node/scheduler/priority.hpp>
#include <nano/node/transport/inproc.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>
#include <nano/test_common/ledger.hpp>
#include <nano/test_common/system.hpp>
#include <nano/test_common/testutil.hpp>
Expand Down
2 changes: 1 addition & 1 deletion nano/core_test/wallet.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <nano/crypto_lib/random_pool.hpp>
#include <nano/lib/thread_runner.hpp>
#include <nano/lib/threading.hpp>
#include <nano/node/lmdb/wallet_value.hpp>
#include <nano/store/lmdb/wallet_value.hpp>
#include <nano/test_common/system.hpp>
#include <nano/test_common/testutil.hpp>

Expand Down
2 changes: 1 addition & 1 deletion nano/core_test/wallets.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <nano/secure/versioning.hpp>
#include <nano/store/versioning.hpp>
#include <nano/test_common/system.hpp>
#include <nano/test_common/testutil.hpp>

Expand Down
28 changes: 0 additions & 28 deletions nano/node/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,34 +112,19 @@ add_library(
json_handler.cpp
ledger_walker.hpp
ledger_walker.cpp
lmdb/account_store.hpp
lmdb/account_store.cpp
lmdb/block_store.hpp
lmdb/block_store.cpp
lmdb/confirmation_height_store.hpp
lmdb/confirmation_height_store.cpp
lmdb/final_vote_store.hpp
lmdb/final_vote_store.cpp
lmdb/frontier_store.hpp
lmdb/frontier_store.cpp
lmdb/online_weight_store.hpp
lmdb/online_weight_store.cpp
lmdb/peer_store.hpp
lmdb/peer_store.cpp
lmdb/pending_store.hpp
lmdb/pending_store.cpp
lmdb/pruned_store.hpp
lmdb/pruned_store.cpp
lmdb/version_store.hpp
lmdb/version_store.cpp
lmdb/lmdb.hpp
lmdb/lmdb.cpp
lmdb/lmdb_env.hpp
lmdb/lmdb_env.cpp
lmdb/lmdb_iterator.hpp
lmdb/lmdb_txn.hpp
lmdb/lmdb_txn.cpp
lmdb/wallet_value.hpp
lmdb/wallet_value.cpp
logging.hpp
logging.cpp
Expand Down Expand Up @@ -171,30 +156,17 @@ add_library(
repcrawler.cpp
request_aggregator.hpp
request_aggregator.cpp
rocksdb/account_store.hpp
rocksdb/account_store.cpp
rocksdb/block_store.hpp
rocksdb/block_store.cpp
rocksdb/confirmation_height_store.hpp
rocksdb/confirmation_height_store.cpp
rocksdb/final_vote_store.hpp
rocksdb/final_vote_store.cpp
rocksdb/frontier_store.hpp
rocksdb/frontier_store.cpp
rocksdb/online_weight_store.hpp
rocksdb/online_weight_store.cpp
rocksdb/peer_store.hpp
rocksdb/peer_store.cpp
rocksdb/pending_store.hpp
rocksdb/pending_store.cpp
rocksdb/pruned_store.hpp
rocksdb/pruned_store.cpp
rocksdb/version_store.hpp
rocksdb/version_store.cpp
rocksdb/rocksdb.hpp
rocksdb/rocksdb.cpp
rocksdb/rocksdb_iterator.hpp
rocksdb/rocksdb_txn.hpp
rocksdb/rocksdb_txn.cpp
scheduler/bucket.cpp
scheduler/bucket.hpp
Expand Down
4 changes: 2 additions & 2 deletions nano/node/lmdb/account_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <nano/node/lmdb/account_store.hpp>
#include <nano/node/lmdb/lmdb.hpp>
#include <nano/secure/parallel_traversal.hpp>
#include <nano/store/lmdb/account.hpp>
#include <nano/store/lmdb/lmdb.hpp>

nano::lmdb::account_store::account_store (nano::lmdb::store & store_a) :
store (store_a){};
Expand Down
4 changes: 2 additions & 2 deletions nano/node/lmdb/block_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <nano/node/lmdb/block_store.hpp>
#include <nano/node/lmdb/lmdb.hpp>
#include <nano/secure/parallel_traversal.hpp>
#include <nano/store/lmdb/block.hpp>
#include <nano/store/lmdb/lmdb.hpp>

namespace nano
{
Expand Down
4 changes: 2 additions & 2 deletions nano/node/lmdb/confirmation_height_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <nano/node/lmdb/confirmation_height_store.hpp>
#include <nano/node/lmdb/lmdb.hpp>
#include <nano/secure/parallel_traversal.hpp>
#include <nano/store/lmdb/confirmation_height.hpp>
#include <nano/store/lmdb/lmdb.hpp>

nano::lmdb::confirmation_height_store::confirmation_height_store (nano::lmdb::store & store) :
store{ store }
Expand Down
4 changes: 2 additions & 2 deletions nano/node/lmdb/final_vote_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <nano/node/lmdb/final_vote_store.hpp>
#include <nano/node/lmdb/lmdb.hpp>
#include <nano/secure/parallel_traversal.hpp>
#include <nano/store/lmdb/final_vote.hpp>
#include <nano/store/lmdb/lmdb.hpp>

nano::lmdb::final_vote_store::final_vote_store (nano::lmdb::store & store) :
store{ store } {};
Expand Down
4 changes: 2 additions & 2 deletions nano/node/lmdb/frontier_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <nano/node/lmdb/frontier_store.hpp>
#include <nano/node/lmdb/lmdb.hpp>
#include <nano/secure/parallel_traversal.hpp>
#include <nano/store/lmdb/frontier.hpp>
#include <nano/store/lmdb/lmdb.hpp>

nano::lmdb::frontier_store::frontier_store (nano::lmdb::store & store) :
store{ store }
Expand Down
8 changes: 4 additions & 4 deletions nano/node/lmdb/lmdb.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#include <nano/lib/utility.hpp>
#include <nano/node/common.hpp>
#include <nano/node/lmdb/lmdb.hpp>
#include <nano/node/lmdb/lmdb_iterator.hpp>
#include <nano/node/lmdb/wallet_value.hpp>
#include <nano/secure/buffer.hpp>
#include <nano/secure/ledger.hpp>
#include <nano/secure/versioning.hpp>
#include <nano/store/lmdb/lmdb.hpp>
#include <nano/store/lmdb/iterator.hpp>
#include <nano/store/lmdb/wallet_value.hpp>
#include <nano/store/versioning.hpp>

#include <boost/filesystem.hpp>
#include <boost/format.hpp>
Expand Down
2 changes: 1 addition & 1 deletion nano/node/lmdb/lmdb_env.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <nano/node/lmdb/lmdb_env.hpp>
#include <nano/store/lmdb/lmdb_env.hpp>

#include <boost/filesystem/operations.hpp>

Expand Down
4 changes: 2 additions & 2 deletions nano/node/lmdb/lmdb_txn.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#include <nano/lib/logger_mt.hpp>
#include <nano/lib/thread_roles.hpp>
#include <nano/lib/utility.hpp>
#include <nano/node/lmdb/lmdb_env.hpp>
#include <nano/node/lmdb/lmdb_txn.hpp>
#include <nano/store/component.hpp>
#include <nano/store/lmdb/lmdb_env.hpp>
#include <nano/store/lmdb/transaction_impl.hpp>

#include <boost/format.hpp>

Expand Down
4 changes: 2 additions & 2 deletions nano/node/lmdb/online_weight_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <nano/node/lmdb/lmdb.hpp>
#include <nano/node/lmdb/online_weight_store.hpp>
#include <nano/store/lmdb/lmdb.hpp>
#include <nano/store/lmdb/online_weight.hpp>

nano::lmdb::online_weight_store::online_weight_store (nano::lmdb::store & store_a) :
store{ store_a }
Expand Down
4 changes: 2 additions & 2 deletions nano/node/lmdb/peer_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <nano/node/lmdb/lmdb.hpp>
#include <nano/node/lmdb/peer_store.hpp>
#include <nano/store/lmdb/lmdb.hpp>
#include <nano/store/lmdb/peer.hpp>

nano::lmdb::peer_store::peer_store (nano::lmdb::store & store) :
store{ store } {};
Expand Down
4 changes: 2 additions & 2 deletions nano/node/lmdb/pending_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <nano/node/lmdb/lmdb.hpp>
#include <nano/node/lmdb/pending_store.hpp>
#include <nano/secure/parallel_traversal.hpp>
#include <nano/store/lmdb/lmdb.hpp>
#include <nano/store/lmdb/pending.hpp>

nano::lmdb::pending_store::pending_store (nano::lmdb::store & store) :
store{ store } {};
Expand Down
4 changes: 2 additions & 2 deletions nano/node/lmdb/pruned_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <nano/node/lmdb/lmdb.hpp>
#include <nano/node/lmdb/pruned_store.hpp>
#include <nano/secure/parallel_traversal.hpp>
#include <nano/store/lmdb/lmdb.hpp>
#include <nano/store/lmdb/pruned.hpp>

nano::lmdb::pruned_store::pruned_store (nano::lmdb::store & store_a) :
store{ store_a } {};
Expand Down
4 changes: 2 additions & 2 deletions nano/node/lmdb/version_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <nano/node/lmdb/lmdb.hpp>
#include <nano/node/lmdb/version_store.hpp>
#include <nano/store/lmdb/lmdb.hpp>
#include <nano/store/lmdb/version.hpp>

nano::lmdb::version_store::version_store (nano::lmdb::store & store_a) :
store{ store_a } {};
Expand Down
2 changes: 1 addition & 1 deletion nano/node/lmdb/wallet_value.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <nano/node/lmdb/wallet_value.hpp>
#include <nano/store/lmdb/wallet_value.hpp>

nano::wallet_value::wallet_value (nano::db_val<MDB_val> const & val_a)
{
Expand Down
4 changes: 2 additions & 2 deletions nano/node/make_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <nano/node/lmdb/lmdb.hpp>
#include <nano/node/make_store.hpp>
#include <nano/node/rocksdb/rocksdb.hpp>
#include <nano/store/lmdb/lmdb.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>

#include <boost/filesystem/path.hpp>

Expand Down
2 changes: 1 addition & 1 deletion nano/node/node.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <nano/node/daemonconfig.hpp>
#include <nano/node/make_store.hpp>
#include <nano/node/node.hpp>
#include <nano/node/rocksdb/rocksdb.hpp>
#include <nano/node/scheduler/component.hpp>
#include <nano/node/scheduler/hinted.hpp>
#include <nano/node/scheduler/manual.hpp>
Expand All @@ -15,6 +14,7 @@
#include <nano/node/websocket.hpp>
#include <nano/secure/buffer.hpp>
#include <nano/store/component.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>

#include <boost/filesystem.hpp>
#include <boost/property_tree/json_parser.hpp>
Expand Down
4 changes: 2 additions & 2 deletions nano/node/rocksdb/account_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <nano/node/rocksdb/account_store.hpp>
#include <nano/node/rocksdb/rocksdb.hpp>
#include <nano/secure/parallel_traversal.hpp>
#include <nano/store/rocksdb/account.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>

nano::rocksdb::account_store::account_store (nano::rocksdb::store & store_a) :
store (store_a){};
Expand Down
4 changes: 2 additions & 2 deletions nano/node/rocksdb/block_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <nano/node/rocksdb/block_store.hpp>
#include <nano/node/rocksdb/rocksdb.hpp>
#include <nano/secure/parallel_traversal.hpp>
#include <nano/store/rocksdb/block.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>

namespace nano
{
Expand Down
4 changes: 2 additions & 2 deletions nano/node/rocksdb/confirmation_height_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <nano/node/rocksdb/confirmation_height_store.hpp>
#include <nano/node/rocksdb/rocksdb.hpp>
#include <nano/secure/parallel_traversal.hpp>
#include <nano/store/rocksdb/confirmation_height.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>

nano::rocksdb::confirmation_height_store::confirmation_height_store (nano::rocksdb::store & store) :
store{ store }
Expand Down
4 changes: 2 additions & 2 deletions nano/node/rocksdb/final_vote_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <nano/node/rocksdb/final_vote_store.hpp>
#include <nano/node/rocksdb/rocksdb.hpp>
#include <nano/secure/parallel_traversal.hpp>
#include <nano/store/rocksdb/final_vote.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>

nano::rocksdb::final_vote_store::final_vote_store (nano::rocksdb::store & store) :
store{ store } {};
Expand Down
4 changes: 2 additions & 2 deletions nano/node/rocksdb/frontier_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <nano/node/rocksdb/frontier_store.hpp>
#include <nano/node/rocksdb/rocksdb.hpp>
#include <nano/secure/parallel_traversal.hpp>
#include <nano/store/rocksdb/frontier.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>

nano::rocksdb::frontier_store::frontier_store (nano::rocksdb::store & store) :
store{ store }
Expand Down
4 changes: 2 additions & 2 deletions nano/node/rocksdb/online_weight_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <nano/node/rocksdb/online_weight_store.hpp>
#include <nano/node/rocksdb/rocksdb.hpp>
#include <nano/store/rocksdb/online_weight.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>

nano::rocksdb::online_weight_store::online_weight_store (nano::rocksdb::store & store_a) :
store{ store_a }
Expand Down
4 changes: 2 additions & 2 deletions nano/node/rocksdb/peer_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <nano/node/rocksdb/peer_store.hpp>
#include <nano/node/rocksdb/rocksdb.hpp>
#include <nano/store/rocksdb/peer.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>

nano::rocksdb::peer_store::peer_store (nano::rocksdb::store & store) :
store{ store } {};
Expand Down
4 changes: 2 additions & 2 deletions nano/node/rocksdb/pending_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <nano/node/lmdb/pending_store.hpp>
#include <nano/node/rocksdb/rocksdb.hpp>
#include <nano/secure/parallel_traversal.hpp>
#include <nano/store/lmdb/pending.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>

nano::rocksdb::pending_store::pending_store (nano::rocksdb::store & store) :
store{ store } {};
Expand Down
4 changes: 2 additions & 2 deletions nano/node/rocksdb/pruned_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <nano/node/rocksdb/pruned_store.hpp>
#include <nano/node/rocksdb/rocksdb.hpp>
#include <nano/secure/parallel_traversal.hpp>
#include <nano/store/rocksdb/pruned.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>

nano::rocksdb::pruned_store::pruned_store (nano::rocksdb::store & store_a) :
store{ store_a } {};
Expand Down
6 changes: 3 additions & 3 deletions nano/node/rocksdb/rocksdb.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <nano/lib/rocksdbconfig.hpp>
#include <nano/node/rocksdb/rocksdb.hpp>
#include <nano/node/rocksdb/rocksdb_iterator.hpp>
#include <nano/node/rocksdb/rocksdb_txn.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>
#include <nano/store/rocksdb/iterator.hpp>
#include <nano/store/rocksdb/transaction_impl.hpp>

#include <boost/filesystem.hpp>
#include <boost/format.hpp>
Expand Down
2 changes: 1 addition & 1 deletion nano/node/rocksdb/rocksdb_txn.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <nano/node/rocksdb/rocksdb_txn.hpp>
#include <nano/store/rocksdb/transaction_impl.hpp>

nano::read_rocksdb_txn::read_rocksdb_txn (rocksdb::DB * db_a) :
db (db_a)
Expand Down
4 changes: 2 additions & 2 deletions nano/node/rocksdb/version_store.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <nano/node/rocksdb/rocksdb.hpp>
#include <nano/node/rocksdb/version_store.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>
#include <nano/store/rocksdb/version.hpp>

nano::rocksdb::version_store::version_store (nano::rocksdb::store & store_a) :
store{ store_a } {};
Expand Down
2 changes: 1 addition & 1 deletion nano/node/wallet.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#include <nano/lib/threading.hpp>
#include <nano/lib/utility.hpp>
#include <nano/node/election.hpp>
#include <nano/node/lmdb/lmdb_iterator.hpp>
#include <nano/node/node.hpp>
#include <nano/node/wallet.hpp>
#include <nano/store/lmdb/iterator.hpp>

#include <boost/filesystem.hpp>
#include <boost/format.hpp>
Expand Down
4 changes: 2 additions & 2 deletions nano/node/wallet.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
#include <nano/lib/lmdbconfig.hpp>
#include <nano/lib/locks.hpp>
#include <nano/lib/work.hpp>
#include <nano/node/lmdb/lmdb.hpp>
#include <nano/node/lmdb/wallet_value.hpp>
#include <nano/node/openclwork.hpp>
#include <nano/secure/common.hpp>
#include <nano/store/component.hpp>
#include <nano/store/lmdb/lmdb.hpp>
#include <nano/store/lmdb/wallet_value.hpp>

#include <atomic>
#include <mutex>
Expand Down
1 change: 0 additions & 1 deletion nano/secure/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ add_library(
network_filter.cpp
utility.hpp
utility.cpp
versioning.hpp
versioning.cpp
working.hpp)

Expand Down
Loading

0 comments on commit 1e323ea

Please sign in to comment.