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

Removing unused parameter.

Browse source
This commit is contained in:
clemahieu 2017-03-30 00:28:46 -05:00
commit 9e0e71e97c
8 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rai/core_test/network.cpp
View file

@ -193,7 +193,7 @@ TEST (network, send_valid_confirm_ack)
rai::send_block block2 (latest1, key2.pub, 50, rai::test_genesis_key.prv, rai::test_genesis_key.pub, system.work.generate (latest1));
auto hash2 (block2.hash ());
rai::block_hash latest2 (system.nodes [1]->latest (rai::test_genesis_key.pub));
system.nodes [0]->process_receive_republish (std::unique_ptr <rai::block> (new rai::send_block (block2)), 0);
system.nodes [0]->process_receive_republish (std::unique_ptr <rai::block> (new rai::send_block (block2)));
auto iterations (0);
while (system.nodes [1]->network.confirm_ack_count == 0)
{
@ -217,7 +217,7 @@ TEST (network, send_valid_publish)
rai::send_block block2 (latest1, key2.pub, 50, rai::test_genesis_key.prv, rai::test_genesis_key.pub, system.work.generate (latest1));
auto hash2 (block2.hash ());
rai::block_hash latest2 (system.nodes [1]->latest (rai::test_genesis_key.pub));
system.nodes [1]->process_receive_republish (std::unique_ptr <rai::block> (new rai::send_block (block2)), 0);
system.nodes [1]->process_receive_republish (std::unique_ptr <rai::block> (new rai::send_block (block2)));
auto iterations (0);
while (system.nodes [0]->network.publish_count == 0)
{
@ -306,8 +306,8 @@ TEST (receivable_processor, send_with_receive)
ASSERT_EQ (0, system.nodes [0]->balance (key2.pub));
ASSERT_EQ (amount, system.nodes [1]->balance (rai::test_genesis_key.pub));
ASSERT_EQ (0, system.nodes [1]->balance (key2.pub));
system.nodes [0]->process_receive_republish (block1->clone (), 0);
system.nodes [1]->process_receive_republish (block1->clone (), 0);
system.nodes [0]->process_receive_republish (block1->clone ());
system.nodes [1]->process_receive_republish (block1->clone ());
ASSERT_EQ (amount - system.nodes [0]->config.receive_minimum.number (), system.nodes [0]->balance (rai::test_genesis_key.pub));
ASSERT_EQ (0, system.nodes [0]->balance (key2.pub));
ASSERT_EQ (amount - system.nodes [0]->config.receive_minimum.number (), system.nodes [1]->balance (rai::test_genesis_key.pub));

36
rai/core_test/node.cpp
View file

@ -160,8 +160,8 @@ TEST (node, send_out_of_order)
rai::genesis genesis;
rai::send_block send1 (genesis.hash (), key2.pub, std::numeric_limits <rai::uint128_t>::max () - system.nodes [0]->config.receive_minimum.number (), rai::test_genesis_key.prv, rai::test_genesis_key.pub, system.work.generate (genesis.hash ()));
rai::send_block send2 (send1.hash (), key2.pub, std::numeric_limits <rai::uint128_t>::max () - system.nodes [0]->config.receive_minimum.number () * 2, rai::test_genesis_key.prv, rai::test_genesis_key.pub, system.work.generate (send1.hash ()));
system.nodes [0]->process_receive_republish (std::unique_ptr <rai::block> (new rai::send_block (send2)), 0);
system.nodes [0]->process_receive_republish (std::unique_ptr <rai::block> (new rai::send_block (send1)), 0);
system.nodes [0]->process_receive_republish (std::unique_ptr <rai::block> (new rai::send_block (send2)));
system.nodes [0]->process_receive_republish (std::unique_ptr <rai::block> (new rai::send_block (send1)));
auto iterations (0);
while (std::any_of (system.nodes.begin (), system.nodes.end (), [&] (std::shared_ptr <rai::node> const & node_a) {return node_a->balance (rai::test_genesis_key.pub) != rai::genesis_amount - system.nodes [0]->config.receive_minimum.number () * 2;}))
{
@ -178,7 +178,7 @@ TEST (node, quick_confirm)
rai::block_hash previous (system.nodes [0]->latest (rai::test_genesis_key.pub));
system.wallet (0)->insert_adhoc (key.prv);
rai::send_block send (previous, key.pub, 0, rai::test_genesis_key.prv, rai::test_genesis_key.pub, system.work.generate (previous));
system.nodes [0]->process_receive_republish (send.clone (), 0);
system.nodes [0]->process_receive_republish (send.clone ());
auto iterations (0);
while (system.nodes [0]->balance (key.pub).is_zero ())
{
@ -679,13 +679,13 @@ TEST (node, fork_publish)
rai::send_block send1 (genesis.hash (), key1.pub, rai::genesis_amount - 100, rai::test_genesis_key.prv, rai::test_genesis_key.pub, 0);
rai::keypair key2;
rai::send_block send2 (genesis.hash (), key2.pub, rai::genesis_amount - 100, rai::test_genesis_key.prv, rai::test_genesis_key.pub, 0);
node1.process_receive_republish (send1.clone (), 0);
node1.process_receive_republish (send1.clone ());
ASSERT_EQ (1, node1.active.roots.size ());
auto existing (node1.active.roots.find (send1.root ()));
ASSERT_NE (node1.active.roots.end (), existing);
auto election (existing->election);
ASSERT_EQ (2, election->votes.rep_votes.size ());
node1.process_receive_republish (send2.clone (), 0);
node1.process_receive_republish (send2.clone ());
auto existing1 (election->votes.rep_votes.find (rai::test_genesis_key.pub));
ASSERT_NE (election->votes.rep_votes.end (), existing1);
ASSERT_EQ (send1, *existing1->second);
@ -710,12 +710,12 @@ TEST (node, fork_keep)
// send1 and send2 fork to different accounts
rai::send_block send1 (genesis.hash (), key1.pub, rai::genesis_amount - 100, rai::test_genesis_key.prv, rai::test_genesis_key.pub, system.work.generate (genesis.hash ()));
rai::send_block send2 (genesis.hash (), key2.pub, rai::genesis_amount - 100, rai::test_genesis_key.prv, rai::test_genesis_key.pub, system.work.generate (genesis.hash ()));
node1.process_receive_republish (send1.clone (), 0);
node2.process_receive_republish (send1.clone (), 0);
node1.process_receive_republish (send1.clone ());
node2.process_receive_republish (send1.clone ());
ASSERT_EQ (1, node1.active.roots.size ());
ASSERT_EQ (1, node2.active.roots.size ());
node1.process_receive_republish (send2.clone (), 0);
node2.process_receive_republish (send2.clone (), 0);
node1.process_receive_republish (send2.clone ());
node2.process_receive_republish (send2.clone ());
auto conflict (node2.active.roots.find (genesis.hash ()));
ASSERT_NE (node2.active.roots.end (), conflict);
auto votes1 (conflict->election);
@ -932,22 +932,22 @@ TEST (node, fork_open_flip)
rai::keypair rep1;
rai::keypair rep2;
rai::send_block send1 (genesis.hash (), key1.pub, rai::genesis_amount - 1, rai::test_genesis_key.prv, rai::test_genesis_key.pub, system.work.generate (genesis.hash ()));
node1.process_receive_republish (send1.clone (), 0);
node2.process_receive_republish (send1.clone (), 0);
node1.process_receive_republish (send1.clone ());
node2.process_receive_republish (send1.clone ());
// We should be keeping this block
rai::open_block open1 (send1.hash (), rep1.pub, key1.pub, key1.prv, key1.pub, system.work.generate (key1.pub));
// This block should be evicted
rai::open_block open2 (send1.hash (), rep2.pub, key1.pub, key1.prv, key1.pub, system.work.generate (key1.pub));
ASSERT_FALSE (open1 == open2);
// node1 gets copy that will remain
node1.process_receive_republish (open1.clone (), 0);
node1.process_receive_republish (open1.clone ());
// node2 gets copy that will be evicted
node2.process_receive_republish (open2.clone (), 0);
node2.process_receive_republish (open2.clone ());
ASSERT_EQ (2, node1.active.roots.size ());
ASSERT_EQ (2, node2.active.roots.size ());
// Notify both nodes that a fork exists
node1.process_receive_republish (open2.clone (), 0);
node2.process_receive_republish (open1.clone (), 0);
node1.process_receive_republish (open2.clone ());
node2.process_receive_republish (open1.clone ());
auto conflict (node2.active.roots.find (open1.root ()));
ASSERT_NE (node2.active.roots.end (), conflict);
auto votes1 (conflict->election);
@ -1077,12 +1077,12 @@ TEST (node, broadcast_elected)
system.wallet (2)->insert_adhoc (rep_other.prv);
rai::send_block fork0 (node2->latest (rai::test_genesis_key.pub), rep_small.pub, 0, rai::test_genesis_key.prv, rai::test_genesis_key.pub, 0);
node0->generate_work (fork0);
node0->process_receive_republish (fork0.clone (), 0);
node1->process_receive_republish (fork0.clone (), 0);
node0->process_receive_republish (fork0.clone ());
node1->process_receive_republish (fork0.clone ());
rai::send_block fork1 (node2->latest (rai::test_genesis_key.pub), rep_big.pub, 0, rai::test_genesis_key.prv, rai::test_genesis_key.pub, 0);
node0->generate_work (fork1);
system.wallet (2)->insert_adhoc (rep_small.prv);
node2->process_receive_republish (fork1.clone (), 0);
node2->process_receive_republish (fork1.clone ());
//std::cerr << "fork0: " << fork_hash.to_string () << std::endl;
//std::cerr << "fork1: " << fork1.hash ().to_string () << std::endl;
auto iterations (0);

2
rai/node/bootstrap.cpp
View file

@ -1535,7 +1535,7 @@ void rai::bulk_push_server::received_block (boost::system::error_code const & ec
{
if (!connection->node->bootstrap_initiator.in_progress ())
{
connection->node->process_receive_republish (std::move (block), 0);
connection->node->process_receive_republish (std::move (block));
}
receive ();
}

10
rai/node/node.cpp
View file

@ -330,7 +330,7 @@ public:
++node.network.publish_count;
node.peers.contacted (sender);
node.peers.insert (sender);
node.process_receive_republish (message_a.block->clone (), 0);
node.process_receive_republish (message_a.block->clone ());
}
void confirm_req (rai::confirm_req const & message_a) override
{
@ -341,7 +341,7 @@ public:
++node.network.confirm_req_count;
node.peers.contacted (sender);
node.peers.insert (sender);
node.process_receive_republish (message_a.block->clone (), 0);
node.process_receive_republish (message_a.block->clone ());
if (node.ledger.block_exists (message_a.block->hash ()))
{
confirm_broadcast (node, sender, message_a.block->clone ());
@ -356,7 +356,7 @@ public:
++node.network.confirm_ack_count;
node.peers.contacted (sender);
node.peers.insert (sender);
node.process_receive_republish (message_a.vote.block->clone (), 0);
node.process_receive_republish (message_a.vote.block->clone ());
node.vote_processor.vote (message_a.vote, sender);
}
void bulk_pull (rai::bulk_pull const &) override
@ -1223,13 +1223,13 @@ void rai::network::confirm_block (rai::raw_key const & prv, rai::public_key cons
});
}
void rai::node::process_receive_republish (std::unique_ptr <rai::block> incoming, size_t rebroadcast_a)
void rai::node::process_receive_republish (std::unique_ptr <rai::block> incoming)
{
std::vector <std::tuple <rai::process_return, std::unique_ptr <rai::block>>> completed;
{
rai::transaction transaction (store.environment, nullptr, true);
assert (incoming != nullptr);
process_receive_many (transaction, *incoming, [this, rebroadcast_a, &completed, &transaction] (rai::process_return result_a, rai::block const & block_a)
process_receive_many (transaction, *incoming, [this, &completed, &transaction] (rai::process_return result_a, rai::block const & block_a)
{
switch (result_a.code)
{

2
rai/node/node.hpp
View file

@ -419,7 +419,7 @@ public:
void process_unchecked (std::shared_ptr <rai::bootstrap_attempt>);
void process_confirmed (rai::block const &);
void process_message (rai::message &, rai::endpoint const &);
void process_receive_republish (std::unique_ptr <rai::block>, size_t);
void process_receive_republish (std::unique_ptr <rai::block>);
void process_receive_many (rai::block const &, std::function <void (rai::process_return, rai::block const &)> = [] (rai::process_return, rai::block const &) {});
void process_receive_many (MDB_txn *, rai::block const &, std::function <void (rai::process_return, rai::block const &)> = [] (rai::process_return, rai::block const &) {});
rai::process_return process_receive_one (MDB_txn *, rai::block const &);

2
rai/node/rpc.cpp
View file

@ -1140,7 +1140,7 @@ void rai::rpc_handler::process ()
{
if (!node.work.work_validate (*block))
{
node.process_receive_republish (std::move (block), 0);
node.process_receive_republish (std::move (block));
boost::property_tree::ptree response_l;
response (response_l);
}

6
rai/node/wallet.cpp
View file

@ -991,7 +991,7 @@ std::unique_ptr <rai::block> rai::wallet::receive_action (rai::send_block const
if (block != nullptr)
{
assert (block != nullptr);
node.process_receive_republish (block->clone (), node.config.creation_rebroadcast);
node.process_receive_republish (block->clone ());
auto hash (block->hash ());
auto this_l (shared_from_this ());
auto source (send_a.hashables.destination);
@ -1029,7 +1029,7 @@ std::unique_ptr <rai::block> rai::wallet::change_action (rai::account const & so
if (block != nullptr)
{
assert (block != nullptr);
node.process_receive_republish (block->clone (), node.config.creation_rebroadcast);
node.process_receive_republish (block->clone ());
auto hash (block->hash ());
auto this_l (shared_from_this ());
node.wallets.queue_wallet_action (source_a, rai::wallets::generate_priority, [this_l, source_a, hash]
@ -1070,7 +1070,7 @@ std::unique_ptr <rai::block> rai::wallet::send_action (rai::account const & sour
if (block != nullptr)
{
assert (block != nullptr);
node.process_receive_republish (block->clone (), node.config.creation_rebroadcast);
node.process_receive_republish (block->clone ());
auto hash (block->hash ());
auto this_l (shared_from_this ());
node.wallets.queue_wallet_action (source_a, rai::wallets::generate_priority, [this_l, source_a, hash]

2
rai/qt/qt.cpp
View file

@ -1402,7 +1402,7 @@ wallet (wallet_a)
{
show_label_ok (*status);
this->status->setText ("");
this->wallet.node.process_receive_republish (std::move (block_l), 0);
this->wallet.node.process_receive_republish (std::move (block_l));
}
else
{