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

Name conflict

Browse source
This commit is contained in:
Piotr Wójcik 2024-02-08 19:12:15 +01:00
commit 124421bfef
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nano/node/active_transactions.cpp
View file

@ -34,7 +34,7 @@ nano::active_transactions::active_transactions (nano::node & node_a, nano::confi
});
// Notify elections about alternative (forked) blocks
block_processor.processed.add ([this] (auto const & result, auto const & block, auto const & context) {
block_processor.block_processed.add ([this] (auto const & result, auto const & block, auto const & context) {
switch (result.code)
{
case nano::process_result::fork:

2
nano/node/block_broadcast.cpp
View file

@ -14,7 +14,7 @@ void nano::block_broadcast::connect (nano::block_processor & block_processor)
{
return;
}
block_processor.processed.add ([this] (auto const & result, auto const & block, auto const & context) {
block_processor.block_processed.add ([this] (auto const & result, auto const & block, auto const & context) {
switch (result.code)
{
case nano::process_result::progress:

2
nano/node/blockprocessor.cpp
View file

@ -41,7 +41,7 @@ nano::block_processor::block_processor (nano::node & node_a, nano::write_databas
// For every batch item: notify the 'processed' observer.
for (auto const & [result, block, context] : items)
{
processed.notify (result, block, context);
block_processed.notify (result, block, context);
}
});
processing_thread = std::thread ([this] () {

4
nano/node/blockprocessor.hpp
View file

@ -87,8 +87,8 @@ public: // Events
using processed_t = std::tuple<nano::process_return, std::shared_ptr<nano::block>, context>;
using processed_batch_t = std::deque<processed_t>;
// The batch observer feeds the processed obsever
nano::observer_set<nano::process_return const &, std::shared_ptr<nano::block> const &, context const &> processed;
// The batch observer feeds the processed observer
nano::observer_set<nano::process_return const &, std::shared_ptr<nano::block> const &, context const &> block_processed;
nano::observer_set<processed_batch_t const &> batch_processed;
private: