Remove generic parameter of solo consensus

Author: foriequal0

core/src/consensus/solo/mod.rs

@@ -19,12 +19,15 @@ mod params;
 use std::sync::Arc;
 
 use cstate::{ActionHandler, HitHandler};
-use ctypes::machine::{Header, LiveBlock, Transactions, WithBalances};
+use ctypes::machine::WithBalances;
 
 use self::params::SoloParams;
 use super::{ConsensusEngine, Seal};
+use crate::block::{ExecutedBlock, IsBlock};
+use crate::codechain_machine::CodeChainMachine;
 use crate::consensus::EngineType;
-use crate::SignedTransaction;
+use crate::error::Error;
+use crate::header::Header;
 
 /// A consensus engine which does not provide any consensus mechanism.
 pub struct Solo<M> {
@@ -49,15 +52,12 @@ impl<M> Solo<M> {
     }
 }
 
-impl<M: WithBalances> ConsensusEngine<M> for Solo<M>
-where
-    M::LiveBlock: Transactions<Transaction = SignedTransaction>,
-{
+impl ConsensusEngine<CodeChainMachine> for Solo<CodeChainMachine> {
     fn name(&self) -> &str {
         "Solo"
     }
 
-    fn machine(&self) -> &M {
+    fn machine(&self) -> &CodeChainMachine {
         &self.machine
     }
 
@@ -69,16 +69,16 @@ where
         EngineType::Solo
     }
 
-    fn generate_seal(&self, _block: &M::LiveBlock, _parent: &M::Header) -> Seal {
+    fn generate_seal(&self, _block: &ExecutedBlock, _parent: &Header) -> Seal {
         Seal::Solo
     }
 
-    fn verify_local_seal(&self, _header: &M::Header) -> Result<(), M::Error> {
+    fn verify_local_seal(&self, _header: &Header) -> Result<(), Error> {
         Ok(())
     }
 
-    fn on_close_block(&self, block: &mut M::LiveBlock) -> Result<(), M::Error> {
-        let author = *LiveBlock::header(&*block).author();
+    fn on_close_block(&self, block: &mut ExecutedBlock) -> Result<(), Error> {
+        let author = *block.header().author();
         let total_reward = self.block_reward(block.header().number())
             + self.block_fee(Box::new(block.transactions().to_owned().into_iter().map(Into::into)));
         self.machine.add_balance(block, &author, total_reward)