未验证 提交 7e12d605 编写于 作者: K Kevin Heifner 提交者: GitHub

Merge pull request #732 from EOSIO/chain-copy-731

Remove chain_controller move constructor.
......@@ -45,7 +45,10 @@ namespace eosio { namespace chain {
uint32_t create_block_txn_execution_time,
const txn_msg_limits& rate_limit,
const applied_irreverisable_block_func& applied_func = {});
chain_controller(chain_controller&&) = default;
chain_controller(const chain_controller&) = delete;
chain_controller(chain_controller&&) = delete;
chain_controller& operator=(const chain_controller&) = delete;
chain_controller& operator=(chain_controller&&) = delete;
~chain_controller();
/**
......
......@@ -54,7 +54,7 @@ public:
fc::optional<fork_database> fork_db;
fc::optional<block_log> block_logger;
fc::optional<chain_controller> chain;
std::unique_ptr<chain_controller> chain;
chain_id_type chain_id;
uint32_t rcvd_block_txn_execution_time;
uint32_t txn_execution_time;
......@@ -225,13 +225,13 @@ void chain_plugin::plugin_startup()
my->fork_db = fork_database();
my->block_logger = block_log(my->block_log_dir);
my->chain_id = genesis.compute_chain_id();
my->chain = chain_controller(db, *my->fork_db, *my->block_logger,
my->chain.reset(new chain_controller(db, *my->fork_db, *my->block_logger,
initializer, native_contract::make_administrator(),
my->txn_execution_time,
my->rcvd_block_txn_execution_time,
my->create_block_txn_execution_time,
my->cfg_txn_msg_limits,
applied_func);
applied_func));
if(!my->readonly) {
ilog("starting chain in read/write mode");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册