dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Splitting block_uniquer in to its own file

Browse source
This commit is contained in:
Colin LeMahieu 2024-03-07 03:13:22 +00:00
commit 15979e856e
No known key found for this signature in database
GPG key ID: 43708520C8DFB938
5 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nano/lib/CMakeLists.txt
View file

@ -25,6 +25,7 @@ add_library(
block_sideband.cpp block_sideband.cpp
block_type.hpp block_type.hpp
block_type.cpp block_type.cpp
block_uniquer.hpp
blockbuilders.hpp blockbuilders.hpp
blockbuilders.cpp blockbuilders.cpp
blocks.hpp blocks.hpp

10
nano/lib/block_uniquer.hpp Normal file
View file

@ -0,0 +1,10 @@
#pragma once
#include <nano/lib/numbers.hpp>
#include <nano/lib/uniquer.hpp>
namespace nano
{
class block;
using block_uniquer = nano::uniquer<nano::uint256_union, nano::block>;
}

4
nano/lib/blocks.hpp
View file

@ -2,6 +2,7 @@
#include <nano/crypto/blake2/blake2.h> #include <nano/crypto/blake2/blake2.h>
#include <nano/lib/block_sideband.hpp> #include <nano/lib/block_sideband.hpp>
#include <nano/lib/block_uniquer.hpp>
#include <nano/lib/epoch.hpp> #include <nano/lib/epoch.hpp>
#include <nano/lib/errors.hpp> #include <nano/lib/errors.hpp>
#include <nano/lib/numbers.hpp> #include <nano/lib/numbers.hpp>
@ -9,7 +10,6 @@
#include <nano/lib/optional_ptr.hpp> #include <nano/lib/optional_ptr.hpp>
#include <nano/lib/stream.hpp> #include <nano/lib/stream.hpp>
#include <nano/lib/timer.hpp> #include <nano/lib/timer.hpp>
#include <nano/lib/uniquer.hpp>
#include <nano/lib/utility.hpp> #include <nano/lib/utility.hpp>
#include <nano/lib/work.hpp> #include <nano/lib/work.hpp>
@ -378,8 +378,6 @@ public:
virtual ~mutable_block_visitor () = default; virtual ~mutable_block_visitor () = default;
}; };
using block_uniquer = nano::uniquer<nano::uint256_union, nano::block>;
std::shared_ptr<nano::block> deserialize_block (nano::stream &); std::shared_ptr<nano::block> deserialize_block (nano::stream &);
std::shared_ptr<nano::block> deserialize_block (nano::stream &, nano::block_type, nano::block_uniquer * = nullptr); std::shared_ptr<nano::block> deserialize_block (nano::stream &, nano::block_type, nano::block_uniquer * = nullptr);
std::shared_ptr<nano::block> deserialize_block_json (boost::property_tree::ptree const &, nano::block_uniquer * = nullptr); std::shared_ptr<nano::block> deserialize_block_json (boost::property_tree::ptree const &, nano::block_uniquer * = nullptr);

1
nano/node/messages.hpp
View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <nano/lib/asio.hpp> #include <nano/lib/asio.hpp>
#include <nano/lib/block_uniquer.hpp>
#include <nano/lib/blocks.hpp> #include <nano/lib/blocks.hpp>
#include <nano/lib/config.hpp> #include <nano/lib/config.hpp>
#include <nano/lib/errors.hpp> #include <nano/lib/errors.hpp>

1
nano/node/node.hpp
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <nano/lib/block_uniquer.hpp>
#include <nano/lib/config.hpp> #include <nano/lib/config.hpp>
#include <nano/lib/logging.hpp> #include <nano/lib/logging.hpp>
#include <nano/lib/stats.hpp> #include <nano/lib/stats.hpp>