Fixes errors after master rebase

core/consensus/aura/src/lib.rs

@@ -498,12 +498,12 @@ impl<B: Block, C, E, MakeInherent, Inherent> Verifier<B> for AuraVerifier<C, E,
 				// actually matches the slot set in the seal.
 				if let Some(inner_body) = body.take() {
 					let inherent = (self.make_inherent)(timestamp_now, slot_num);
-					let block = Block::new(pre_header.clone(), inner_body);
+					let block: B = Block::new(pre_header.clone(), inner_body);
 
 					let inherent_res = self.client.runtime_api().check_inherents(
 						&BlockId::Hash(parent_hash),
-						&block,
-						&inherent,
+						block.clone(),
+						inherent,
 					).map_err(|e| format!("{:?}", e))?;
 
 					match inherent_res {

core/state-machine/src/lib.rs

@@ -312,7 +312,7 @@ pub fn execute_using_consensus_failure_handler<
 	manager: ExecutionManager<Handler>,
 	compute_tx: bool,
 	mut native_call: Option<NC>,
-) -> Result<(NativeOrEncoded<R>, B::Transaction, Option<MemoryDB<H>>), Box<Error>>
+) -> Result<(NativeOrEncoded<R>, Option<B::Transaction>, Option<MemoryDB<H>>), Box<Error>>
 where
 	H: Hasher,
 	Exec: CodeExecutor<H>,
@@ -469,7 +469,9 @@ where
 	H::Out: Ord + HeapSizeOf,
 {
 	let proving_backend = proving_backend::ProvingBackend::new(trie_backend);
-	let (result, _, _) = execute_using_consensus_failure_handler::<H, _, changes_trie::InMemoryStorage<H>, _, _>(
+	let (result, _, _) = execute_using_consensus_failure_handler::
+		<H, _, changes_trie::InMemoryStorage<H>, _, _, NeverNativeValue, fn() -> NeverNativeValue>
+	(
 		&proving_backend,
 		None,
 		overlay,
@@ -478,9 +480,10 @@ where
 		call_data,
 		native_when_possible(),
 		false,
+		None,
 	)?;
 	let proof = proving_backend.extract_proof();
-	Ok((result, proof))
+	Ok((result.into_encoded(), proof))
 }
 
 /// Check execution proof, generated by `prove_execution` call.
@@ -514,7 +517,9 @@ where
 	Exec: CodeExecutor<H>,
 	H::Out: Ord + HeapSizeOf,
 {
-	execute_using_consensus_failure_handler::<H, _, changes_trie::InMemoryStorage<H>, _, _>(
+	execute_using_consensus_failure_handler::
+		<H, _, changes_trie::InMemoryStorage<H>, _, _, NeverNativeValue, fn() -> NeverNativeValue>
+	(
 		trie_backend,
 		None,
 		overlay,
@@ -523,7 +528,8 @@ where
 		call_data,
 		native_when_possible(),
 		false,
-	).map(|(result, _, _)| result)
+		None,
+	).map(|(result, _, _)| result.into_encoded())
 }
 
 /// Generate storage read proof.