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

Rename abort -> stop.

Browse source
This commit is contained in:
clemahieu 2018-10-21 13:46:41 +01:00
commit 024019d1c5
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rai/node/node.cpp
View file

@ -2555,7 +2555,7 @@ node (node_a),
root (block_a->root ()),
status ({ block_a, 0 }),
confirmed (false),
aborted (false)
stopped (false)
{
last_votes.insert (std::make_pair (rai::not_an_account, rai::vote_info{ std::chrono::steady_clock::now (), 0, block_a->hash () }));
blocks.insert (std::make_pair (block_a->hash (), block_a));
@ -2586,9 +2586,9 @@ void rai::election::confirm_once (rai::transaction const & transaction_a)
}
}
void rai::election::abort ()
void rai::election::stop ()
{
aborted = true;
stopped = true;
}
bool rai::election::have_quorum (rai::tally_t const & tally_a, rai::uint128_t tally_sum)
@ -2812,7 +2812,7 @@ void rai::active_transactions::announce_votes ()
for (auto i (roots.begin ()), n (roots.end ()); i != n; ++i)
{
auto election_l (i->election);
if ((election_l->confirmed || election_l->aborted) && i->announcements >= announcement_min - 1)
if ((election_l->confirmed || election_l->stopped) && i->announcements >= announcement_min - 1)
{
if (election_l->confirmed)
{
@ -2869,16 +2869,16 @@ void rai::active_transactions::announce_votes ()
}
if (i->announcements < announcement_long || i->announcements % announcement_long == 1)
{
// Broadcast winner
if (node.ledger.could_fit (transaction, *election_l->status.winner))
{
// Broadcast winner
rebroadcast_bundle.push_back (election_l->status.winner);
}
else
{
if (i->announcements != 0)
{
election_l->abort ();
election_l->stop ();
}
}
}

4
rai/node/node.hpp
View file

@ -71,14 +71,14 @@ public:
void confirm_if_quorum (rai::transaction const &);
void log_votes (rai::tally_t const &);
bool publish (std::shared_ptr<rai::block> block_a);
void abort ();
void stop ();
rai::node & node;
std::unordered_map<rai::account, rai::vote_info> last_votes;
std::unordered_map<rai::block_hash, std::shared_ptr<rai::block>> blocks;
rai::block_hash root;
rai::election_status status;
std::atomic<bool> confirmed;
bool aborted;
bool stopped;
std::unordered_map<rai::block_hash, rai::uint128_t> last_tally;
};
class conflict_info

2
rai/node/rpc.cpp
View file

@ -1380,7 +1380,7 @@ void rai::rpc_handler::confirmation_active ()
std::lock_guard<std::mutex> lock (node.active.mutex);
for (auto i (node.active.roots.begin ()), n (node.active.roots.end ()); i != n; ++i)
{
if (i->announcements >= announcements && !i->election->confirmed && !i->election->aborted)
if (i->announcements >= announcements && !i->election->confirmed && !i->election->stopped)
{
boost::property_tree::ptree entry;
entry.put ("", i->root.to_string ());