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

Fix build missed deserializer changes (#1703)

Browse source
This commit is contained in:
Wesley Shillingford 2019-02-05 17:19:35 +00:00 • committed by Russel Waters
commit 5522a04e3b
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nano/node/node.cpp
View file

@ -1399,9 +1399,9 @@ node (init_a, io_ctx_a, application_path_a, alarm_a, nano::node_config (peering_
nano::node::node (nano::node_init & init_a, boost::asio::io_context & io_ctx_a, boost::filesystem::path const & application_path_a, nano::alarm & alarm_a, nano::node_config const & config_a, nano::work_pool & work_a, nano::node_flags flags_a) : nano::node::node (nano::node_init & init_a, boost::asio::io_context & io_ctx_a, boost::filesystem::path const & application_path_a, nano::alarm & alarm_a, nano::node_config const & config_a, nano::work_pool & work_a, nano::node_flags flags_a) :
io_ctx (io_ctx_a), io_ctx (io_ctx_a),
config (config_a), config (config_a),
flags (flags_a),
alarm (alarm_a), alarm (alarm_a),
work (work_a), work (work_a),
flags (flags_a),
store_impl (std::make_unique<nano::mdb_store> (init_a.block_store_init, config.logging, application_path_a / "data.ldb", config_a.lmdb_max_dbs, !flags.disable_unchecked_drop, flags.sideband_batch_size)), store_impl (std::make_unique<nano::mdb_store> (init_a.block_store_init, config.logging, application_path_a / "data.ldb", config_a.lmdb_max_dbs, !flags.disable_unchecked_drop, flags.sideband_batch_size)),
store (*store_impl), store (*store_impl),
wallets_store_impl (std::make_unique<nano::mdb_wallets_store> (init_a.wallets_store_init, application_path_a / "wallets.ldb", config_a.lmdb_max_dbs)), wallets_store_impl (std::make_unique<nano::mdb_wallets_store> (init_a.wallets_store_init, application_path_a / "wallets.ldb", config_a.lmdb_max_dbs)),

15
nano/secure/common.cpp
View file

@ -342,14 +342,15 @@ bool nano::unchecked_info::deserialize (nano::stream & stream_a)
bool error (block == nullptr); bool error (block == nullptr);
if (!error) if (!error)
{ {
error = nano::read (stream_a, account.bytes); try
if (!error)
{ {
error = nano::read (stream_a, modified); nano::read (stream_a, account.bytes);
if (!error) nano::read (stream_a, modified);
{ nano::read (stream_a, verified);
error = nano::read (stream_a, verified); }
} catch (std::runtime_error const &)
{
error = true;
} }
} }
return error; return error;