Remove broadcast_proposal_block from ConsensusEngine trait

Author: Hyunsik Jeong

core/src/client/importer.rs

@@ -113,8 +113,7 @@ impl Importer {
                 }
                 if let Ok(closed_block) = self.check_and_close_block(&block, client) {
                     if self.engine.is_proposal(&block.header) {
-                        self.engine.on_verified_proposal(encoded::Block::new(block.bytes.clone()));
-                        self.engine.broadcast_proposal_block(encoded::Block::new(block.bytes.clone()))
+                        self.engine.on_verified_proposal(encoded::Block::new(block.bytes.clone()))
                     }
 
                     imported_blocks.push(header.hash());

core/src/consensus/mod.rs

@@ -274,9 +274,6 @@ pub trait ConsensusEngine<M: Machine>: Sync + Send {
     /// Consensus many hold the verified proposal block until it should be imported.
     fn on_verified_proposal(&self, _verified_block_data: encoded::Block) {}
 
-    /// Broadcast a block proposal.
-    fn broadcast_proposal_block(&self, _block: encoded::Block) {}
-
     /// Register an account which signs consensus messages.
     fn set_signer(&self, _ap: Arc<AccountProvider>, _address: Address, _password: Option<Password>) {}
 

core/src/consensus/tendermint/mod.rs

@@ -722,6 +722,11 @@ impl TendermintInner {
             header
         );
         self.move_to_step(Step::Prevote);
+        self.broadcast_proposal_block(encoded::Block::new(sealed_block.rlp_bytes()));
+    }
+
+    fn on_verified_proposal(&self, verified_block_data: encoded::Block) {
+        self.broadcast_proposal_block(verified_block_data);
     }
 
     fn verify_block_basic(&self, header: &Header) -> Result<(), Error> {
@@ -1202,9 +1207,9 @@ impl ConsensusEngine<CodeChainMachine> for Tendermint {
         guard.is_proposal(header)
     }
 
-    fn broadcast_proposal_block(&self, block: encoded::Block) {
+    fn on_verified_proposal(&self, verified_block_data: encoded::Block) {
         let guard = self.inner.lock();
-        guard.broadcast_proposal_block(block)
+        guard.on_verified_proposal(verified_block_data)
     }
 
     fn set_signer(&self, ap: Arc<AccountProvider>, address: Address, password: Option<Password>) {

core/src/miner/miner.rs

@@ -41,7 +41,6 @@ use crate::client::{
     ResealTimer,
 };
 use crate::consensus::{CodeChainEngine, EngineType};
-use crate::encoded;
 use crate::error::Error;
 use crate::header::Header;
 use crate::scheme::Scheme;
@@ -528,7 +527,6 @@ impl Miner {
                         .map(|sealed| {
                             let import_result = chain.import_sealed_block(&sealed);
                             self.engine.proposal_generated(&sealed);
-                            self.engine.broadcast_proposal_block(encoded::Block::new(sealed.rlp_bytes()));
                             import_result.is_ok()
                         })
                         .unwrap_or_else(|e| {