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

Fix vote::to_json() (#1900)

Browse source 
* Fix vote::to_json() block_hash variant

* Serialize all votes and split into serialize_json
This commit is contained in:
Guilherme Lawless 2019-04-12 10:42:02 +01:00 • committed by cryptocode
commit 8976a817af
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
nano/secure/common.cpp
View file

@ -400,26 +400,33 @@ bool nano::vote::operator!= (nano::vote const & other_a) const
return !(*this == other_a);
}
std::string nano::vote::to_json () const
void nano::vote::serialize_json (boost::property_tree::ptree & tree) const
{
std::stringstream stream;
boost::property_tree::ptree tree;
tree.put ("account", account.to_account ());
tree.put ("signature", signature.number ());
tree.put ("sequence", std::to_string (sequence));
boost::property_tree::ptree blocks_tree;
for (auto block : blocks)
{
boost::property_tree::ptree entry;
if (block.which ())
{
blocks_tree.put ("", boost::get<std::shared_ptr<nano::block>> (block)->to_json ());
entry.put ("", boost::get<nano::block_hash> (block).to_string ());
}
else
{
blocks_tree.put ("", boost::get<std::shared_ptr<nano::block>> (block)->hash ().to_string ());
entry.put ("", boost::get<std::shared_ptr<nano::block>> (block)->hash ().to_string ());
}
blocks_tree.push_back (std::make_pair ("", entry));
}
tree.add_child ("blocks", blocks_tree);
}
std::string nano::vote::to_json () const
{
std::stringstream stream;
boost::property_tree::ptree tree;
serialize_json (tree);
boost::property_tree::write_json (stream, tree);
return stream.str ();
}

1
nano/secure/common.hpp
View file

@ -227,6 +227,7 @@ public:
bool operator!= (nano::vote const &) const;
void serialize (nano::stream &, nano::block_type) const;
void serialize (nano::stream &) const;
void serialize_json (boost::property_tree::ptree & tree) const;
bool deserialize (nano::stream &, nano::block_uniquer * = nullptr);
bool validate () const;
boost::transform_iterator<nano::iterate_vote_blocks_as_hash, nano::vote_blocks_vec_iter> begin () const;