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

Remove unused function (#2453)

Browse source 
* Rewriting test to use standard vote generation process.

* Removing unused function.
This commit is contained in:
clemahieu 2019-12-30 22:14:39 -03:00 • committed by GitHub
commit f853d3d856
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

19
nano/core_test/node.cpp
View file

@ -1757,23 +1757,20 @@ TEST (node, rep_self_vote)
ASSERT_EQ (nano::process_result::progress, node0->process (*block0).code); ASSERT_EQ (nano::process_result::progress, node0->process (*block0).code);
auto & active (node0->active); auto & active (node0->active);
active.start (block0); active.start (block0);
nano::unique_lock<std::mutex> lock (active.mutex); std::shared_ptr<nano::election> election;
auto existing (active.roots.find (block0->qualified_root ())); {
ASSERT_NE (active.roots.end (), existing); nano::unique_lock<std::mutex> lock (active.mutex);
auto election (existing->election); auto existing (active.roots.find (block0->qualified_root ()));
lock.unlock (); ASSERT_NE (active.roots.end (), existing);
election = existing->election;
}
node0->block_processor.generator.add (block0->hash ());
system.deadline_set (1s); system.deadline_set (1s);
// Wait until representatives are activated & make vote // Wait until representatives are activated & make vote
while (election->last_votes_size () != 3) while (election->last_votes_size () != 3)
{ {
lock.lock ();
auto transaction (node0->store.tx_begin_read ());
election->compute_rep_votes (transaction);
lock.unlock ();
node0->vote_processor.flush ();
ASSERT_NO_ERROR (system.poll ()); ASSERT_NO_ERROR (system.poll ());
} }
lock.lock ();
auto & rep_votes (election->last_votes); auto & rep_votes (election->last_votes);
ASSERT_NE (rep_votes.end (), rep_votes.find (nano::test_genesis_key.pub)); ASSERT_NE (rep_votes.end (), rep_votes.find (nano::test_genesis_key.pub));
ASSERT_NE (rep_votes.end (), rep_votes.find (rep_big.pub)); ASSERT_NE (rep_votes.end (), rep_votes.find (rep_big.pub));

11
nano/node/election.cpp
View file

@ -23,17 +23,6 @@ stopped (false)
update_dependent (); update_dependent ();
} }
void nano::election::compute_rep_votes (nano::transaction const & transaction_a)
{
if (node.config.enable_voting)
{
node.wallets.foreach_representative ([this, &transaction_a](nano::public_key const & pub_a, nano::raw_key const & prv_a) {
auto vote (this->node.store.vote_generate (transaction_a, pub_a, prv_a, status.winner));
this->node.vote_processor.vote (vote, std::make_shared<nano::transport::channel_udp> (this->node.network.udp_channels, this->node.network.endpoint (), this->node.network_params.protocol.protocol_version));
});
}
}
void nano::election::confirm_once (nano::election_status_type type_a) void nano::election::confirm_once (nano::election_status_type type_a)
{ {
assert (!node.active.mutex.try_lock ()); assert (!node.active.mutex.try_lock ());

2
nano/node/election.hpp
View file

@ -39,8 +39,6 @@ public:
nano::tally_t tally (); nano::tally_t tally ();
// Check if we have vote quorum // Check if we have vote quorum
bool have_quorum (nano::tally_t const &, nano::uint128_t) const; bool have_quorum (nano::tally_t const &, nano::uint128_t) const;
// Change our winner to agree with the network
void compute_rep_votes (nano::transaction const &);
void confirm_once (nano::election_status_type = nano::election_status_type::active_confirmed_quorum); void confirm_once (nano::election_status_type = nano::election_status_type::active_confirmed_quorum);
// Confirm this block if quorum is met // Confirm this block if quorum is met
void confirm_if_quorum (); void confirm_if_quorum ();