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

Merge pull request #3078 from cryptocode/wallet_republish-rpc-fix

Browse source
This commit is contained in:
Sergey Kroshnin 2021-01-07 15:17:35 +03:00 • committed by GitHub
commit f15adfebc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
nano/node/network.cpp
View file

@ -219,22 +219,25 @@ void nano::network::flood_vote_pr (std::shared_ptr<nano::vote> const & vote_a)
void nano::network::flood_block_many (std::deque<std::shared_ptr<nano::block>> blocks_a, std::function<void()> callback_a, unsigned delay_a) void nano::network::flood_block_many (std::deque<std::shared_ptr<nano::block>> blocks_a, std::function<void()> callback_a, unsigned delay_a)
{ {
auto block_l (blocks_a.front ());
blocks_a.pop_front ();
flood_block (block_l);
if (!blocks_a.empty ()) if (!blocks_a.empty ())
{ {
std::weak_ptr<nano::node> node_w (node.shared ()); auto block_l (blocks_a.front ());
node.alarm.add (std::chrono::steady_clock::now () + std::chrono::milliseconds (delay_a + std::rand () % delay_a), [node_w, blocks (std::move (blocks_a)), callback_a, delay_a]() { blocks_a.pop_front ();
if (auto node_l = node_w.lock ()) flood_block (block_l);
{ if (!blocks_a.empty ())
node_l->network.flood_block_many (std::move (blocks), callback_a, delay_a); {
} std::weak_ptr<nano::node> node_w (node.shared ());
}); node.alarm.add (std::chrono::steady_clock::now () + std::chrono::milliseconds (delay_a + std::rand () % delay_a), [node_w, blocks (std::move (blocks_a)), callback_a, delay_a]() {
} if (auto node_l = node_w.lock ())
else if (callback_a) {
{ node_l->network.flood_block_many (std::move (blocks), callback_a, delay_a);
callback_a (); }
});
}
else if (callback_a)
{
callback_a ();
}
} }
} }