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

Moving block type in to header.

Browse source
This commit is contained in:
clemahieu 2014-11-02 08:11:28 -06:00
commit ee3a7210bf
4 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

17
rai/core/core.cpp
View file

@ -1040,10 +1040,9 @@ void rai::election::announce_vote ()
void rai::network::confirm_block (std::unique_ptr <rai::block> block_a, uint64_t sequence_a)
{
rai::confirm_ack confirm;
rai::confirm_ack confirm (std::move (block_a));
confirm.vote.address = client.representative;
confirm.vote.sequence = sequence_a;
confirm.vote.block = std::move (block_a);
rai::private_key prv;
auto error (client.wallet.fetch (client.representative, prv));
assert (!error);
@ -1417,9 +1416,8 @@ void rai::processor::process_confirmation (rai::block const & block_a, rai::endp
rai::private_key prv;
auto error (client.wallet.fetch (client.representative, prv));
assert (!error);
rai::confirm_ack outgoing;
rai::confirm_ack outgoing (block_a.clone ());
outgoing.vote.address = client.representative;
outgoing.vote.block = block_a.clone ();
outgoing.vote.sequence = 0;
rai::sign_message (prv, client.representative, outgoing.vote.hash (), outgoing.vote.signature);
assert (!rai::validate_message (client.representative, outgoing.vote.hash (), outgoing.vote.signature));
@ -1454,6 +1452,13 @@ message (rai::message_type::confirm_ack)
{
}
rai::confirm_ack::confirm_ack (std::unique_ptr <rai::block> block_a) :
message (rai::message_type::confirm_ack)
{
block_type_set (block_a->type ());
vote.block = std::move (block_a);
}
bool rai::confirm_ack::deserialize (rai::stream & stream_a)
{
auto result (read_header (stream_a, version_max, version_using, version_min, type, extensions));
@ -1470,7 +1475,7 @@ bool rai::confirm_ack::deserialize (rai::stream & stream_a)
result = read (stream_a, vote.sequence);
if (!result)
{
vote.block = rai::deserialize_block (stream_a);
vote.block = rai::deserialize_block (stream_a, block_type ());
result = vote.block == nullptr;
}
}
@ -1485,7 +1490,7 @@ void rai::confirm_ack::serialize (rai::stream & stream_a)
write (stream_a, vote.address);
write (stream_a, vote.signature);
write (stream_a, vote.sequence);
rai::serialize_block (stream_a, *vote.block);
vote.block->serialize (stream_a);
}
bool rai::confirm_ack::operator == (rai::confirm_ack const & other_a) const

1
rai/core/core.hpp
View file

@ -198,6 +198,7 @@ namespace rai {
{
public:
confirm_ack ();
confirm_ack (std::unique_ptr <rai::block>);
bool deserialize (rai::stream &);
void serialize (rai::stream &) override;
void visit (rai::message_visitor &) const override;

18
rai/test/block.cpp
View file

@ -168,24 +168,6 @@ TEST (send_block, copy)
ASSERT_EQ (block1, block2);
}
TEST (confirm_ack, serialization)
{
rai::confirm_ack con1;
rai::keypair key1;
con1.vote.address = key1.pub;
con1.vote.block = std::unique_ptr <rai::block> (new rai::send_block);
rai::sign_message (key1.prv, key1.pub, con1.vote.block->hash (), con1.vote.signature);
std::vector <uint8_t> bytes;
{
rai::vectorstream stream1 (bytes);
con1.serialize (stream1);
}
rai::bufferstream stream2 (bytes.data (), bytes.size ());
rai::confirm_ack con2;
con2.deserialize (stream2);
ASSERT_EQ (con1, con2);
}
TEST (block_store, empty_blocks)
{
leveldb::Status init;

17
rai/test/message.cpp
View file

@ -76,4 +76,21 @@ TEST (message, publish_serialization)
ASSERT_EQ (0x01, version_using);
ASSERT_EQ (0x01, version_max);
ASSERT_EQ (rai::message_type::publish, type);
}
TEST (message, confirm_ack_serialization)
{
rai::confirm_ack con1 (std::unique_ptr <rai::block> (new rai::send_block));
rai::keypair key1;
con1.vote.address = key1.pub;
rai::sign_message (key1.prv, key1.pub, con1.vote.block->hash (), con1.vote.signature);
std::vector <uint8_t> bytes;
{
rai::vectorstream stream1 (bytes);
con1.serialize (stream1);
}
rai::bufferstream stream2 (bytes.data (), bytes.size ());
rai::confirm_ack con2;
con2.deserialize (stream2);
ASSERT_EQ (con1, con2);
}