Add complete_register to ConsensusEngine

This is a work-around to the currently order-dependant and
non-deterministic initialization of Tendermint ConsensusEngine/Worker.

Author: foriequal0

codechain/run_node.rs

@@ -367,6 +367,7 @@ pub fn run_node(matches: &ArgMatches) -> Result<(), String> {
 
     // drop the scheme to free up genesis state.
     drop(scheme);
+    client.client().engine().complete_register();
 
     cinfo!(TEST_SCRIPT, "Initialization complete");
 

core/src/consensus/mod.rs

@@ -266,6 +266,8 @@ pub trait ConsensusEngine: Sync + Send {
 
     fn register_chain_notify(&self, _: &Client) {}
 
+    fn complete_register(&self) {}
+
     fn get_best_block_from_best_proposal_header(&self, header: &HeaderView) -> BlockHash {
         header.hash()
     }

core/src/consensus/tendermint/engine.rs

@@ -278,10 +278,6 @@ impl ConsensusEngine for Tendermint {
         let extension = service.register_extension(move |api| TendermintExtension::new(inner, timeouts, api));
         let client = Arc::downgrade(&self.client().unwrap());
         self.extension_initializer.send((extension, client)).unwrap();
-
-        let (result, receiver) = crossbeam::bounded(1);
-        self.inner.send(worker::Event::Restore(result)).unwrap();
-        receiver.recv().unwrap();
     }
 
     fn register_time_gap_config_to_worker(&self, time_gap_params: TimeGapParams) {
@@ -300,6 +296,12 @@ impl ConsensusEngine for Tendermint {
         client.add_notify(Arc::downgrade(&self.chain_notify) as Weak<dyn ChainNotify>);
     }
 
+    fn complete_register(&self) {
+        let (result, receiver) = crossbeam::bounded(1);
+        self.inner.send(worker::Event::Restore(result)).unwrap();
+        receiver.recv().unwrap();
+    }
+
     fn get_best_block_from_best_proposal_header(&self, header: &HeaderView) -> BlockHash {
         header.parent_hash()
     }