Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Allow generate_genesis plugin to quietly do nothing when you don't specify the block number on the witness's command line.

Browse source
This commit is contained in:
Eric Frias 2017-01-03 16:45:14 -05:00
parent d9413b8780
commit 4674fc53ab
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libraries/plugins/generate_genesis/generate_genesis.cpp
View file

@ -50,7 +50,7 @@ void generate_genesis_plugin::plugin_set_program_options(
command_line_options.add_options() command_line_options.add_options()
("output-genesis-file,o", bpo::value<std::string>()->default_value("genesis.json"), "Genesis file to create") ("output-genesis-file,o", bpo::value<std::string>()->default_value("genesis.json"), "Genesis file to create")
("output-csvlog-file,o", bpo::value<std::string>()->default_value("log.csv"), "CSV log file to create") ("output-csvlog-file,o", bpo::value<std::string>()->default_value("log.csv"), "CSV log file to create")
("snapshot-block-number", bpo::value<uint32_t>()->default_value(0), "Block number at which to snapshot balances") ("snapshot-block-number", bpo::value<uint32_t>(), "Block number at which to snapshot balances")
; ;
config_file_options.add(command_line_options); config_file_options.add(command_line_options);
} }
@ -67,32 +67,33 @@ void generate_genesis_plugin::plugin_initialize(const boost::program_options::va
_genesis_filename = options["output-genesis-file"].as<std::string>(); _genesis_filename = options["output-genesis-file"].as<std::string>();
_csvlog_filename = options["output-csvlog-file"].as<std::string>(); _csvlog_filename = options["output-csvlog-file"].as<std::string>();
_block_to_snapshot = options["snapshot-block-number"].as<uint32_t>(); if (options.count("snapshot-block-number"))
_block_to_snapshot = options["snapshot-block-number"].as<uint32_t>();
database().applied_block.connect([this](const graphene::chain::signed_block& b){ block_applied(b); }); database().applied_block.connect([this](const graphene::chain::signed_block& b){ block_applied(b); });
ilog("generate genesis plugin: plugin_initialize() end"); ilog("generate genesis plugin: plugin_initialize() end");
} FC_LOG_AND_RETHROW() } } FC_LOG_AND_RETHROW() }
void generate_genesis_plugin::plugin_startup() void generate_genesis_plugin::plugin_startup()
{ try { { try {
ilog("generate genesis plugin: plugin_startup() begin");
chain::database& d = database(); chain::database& d = database();
if (d.head_block_num() == _block_to_snapshot) if (_block_to_snapshot)
{ {
ilog("generate genesis plugin: already at snapshot block"); if (d.head_block_num() == *_block_to_snapshot)
generate_snapshot(); {
ilog("generate genesis plugin: already at snapshot block");
generate_snapshot();
}
else if (d.head_block_num() > *_block_to_snapshot)
elog("generate genesis plugin: already passed snapshot block, you must reindex to return to the snapshot state");
else
elog("generate genesis plugin: waiting for block ${snapshot_block} to generate snapshot, current head is ${head}",
("snapshot_block", _block_to_snapshot)("head", d.head_block_num()));
} }
else if (d.head_block_num() > _block_to_snapshot)
elog("generate genesis plugin: already passed snapshot block, you must reindex to return to the snapshot state");
else
elog("generate genesis plugin: waiting for block ${snapshot_block} to generate snapshot, current head is ${head}",
("snapshot_block", _block_to_snapshot)("head", d.head_block_num()));
ilog("generate genesis plugin: plugin_startup() end");
} FC_CAPTURE_AND_RETHROW() } } FC_CAPTURE_AND_RETHROW() }
void generate_genesis_plugin::block_applied(const graphene::chain::signed_block& b) void generate_genesis_plugin::block_applied(const graphene::chain::signed_block& b)
{ {
if (b.block_num() == _block_to_snapshot) if (_block_to_snapshot && b.block_num() == *_block_to_snapshot)
{ {
ilog("generate genesis plugin: snapshot block has arrived"); ilog("generate genesis plugin: snapshot block has arrived");
generate_snapshot(); generate_snapshot();

2
libraries/plugins/generate_genesis/include/graphene/generate_genesis/generate_genesis_plugin.hpp
View file

@ -52,7 +52,7 @@ private:
boost::program_options::variables_map _options; boost::program_options::variables_map _options;
uint32_t _block_to_snapshot; fc::optional<uint32_t> _block_to_snapshot;
std::string _genesis_filename; std::string _genesis_filename;
std::string _csvlog_filename; std::string _csvlog_filename;
}; };