Inline submit_proposal_block function in Tendermint

It is hard to know whether submit_proposal_block changes step or
not. Since submit_proposal_block has only two lines of code, it
doesn't remove code duplication. To clarify step transition, inline
the submit_proposal_block function.

Author: majecty

core/src/consensus/tendermint/worker.rs

@@ -949,7 +949,9 @@ impl Worker {
                     block,
                 } => {
                     if !block.transactions().is_empty() {
-                        self.submit_proposal_block(&block);
+                        cinfo!(ENGINE, "Submitting proposal block {}", block.header().hash());
+                        self.move_to_step(TendermintState::Prevote, false);
+                        self.broadcast_proposal_block(self.view, encoded::Block::new(block.rlp_bytes()));
                     } else {
                         ctrace!(ENGINE, "Empty proposal is generated, set timer");
                         self.step = TendermintState::ProposeWaitEmptyBlockTimer {
@@ -986,12 +988,6 @@ impl Worker {
         }
     }
 
-    fn submit_proposal_block(&mut self, sealed_block: &SealedBlock) {
-        cinfo!(ENGINE, "Submitting proposal block {}", sealed_block.header().hash());
-        self.move_to_step(TendermintState::Prevote, false);
-        self.broadcast_proposal_block(self.view, encoded::Block::new(sealed_block.rlp_bytes()));
-    }
-
     fn backup(&self) {
         backup(self.client().get_kvdb().as_ref(), BackupView {
             height: &self.height,
@@ -1221,11 +1217,14 @@ impl Worker {
                 return
             };
 
+            // When self.height != block.header().number() && "propose timeout" is already called,
+            // the state is stuck and can't move to Prevote. We should change the step to Prevote.
+            self.move_to_step(TendermintState::Prevote, false);
             if self.height == block.header().number() {
                 cdebug!(ENGINE, "Empty proposal timer is finished, go to the prevote step and broadcast the block");
-                self.submit_proposal_block(block.as_ref());
+                cinfo!(ENGINE, "Submitting proposal block {}", block.header().hash());
+                self.broadcast_proposal_block(self.view, encoded::Block::new(block.rlp_bytes()));
             } else {
-                self.move_to_step(TendermintState::Prevote, false);
                 cwarn!(ENGINE, "Empty proposal timer was for previous height.");
             }