Some fixes after master merge

client/consensus/babe/src/lib.rs

@@ -1160,7 +1160,7 @@ pub fn block_import<B, E, Block: BlockT, I, RA, PRA>(
 	api: Arc<PRA>,
 ) -> ClientResult<(BabeBlockImport<B, E, Block, I, RA, PRA>, BabeLink<Block>)> where
 	B: Backend<Block>,
-	E: CallExecutor<Block> + Send + Sync, + 'static,
+	E: CallExecutor<Block> + Send + Sync + 'static,
 	RA: Send + Sync,
 	Client<B, E, Block, RA>: AuxStore,
 {

client/executor/src/lib.rs

@@ -78,7 +78,7 @@ pub fn call_in_wasm<HF: sp_wasm_interface::HostFunctions>(
 		code,
 		heap_pages,
 		HF::host_functions(),
-        allow_missing_imports,
+		allow_missing_imports,
 	)
 }
 
@@ -92,14 +92,14 @@ pub fn call_in_wasm_with_host_functions(
 	code: &[u8],
 	heap_pages: u64,
 	host_functions: Vec<&'static dyn sp_wasm_interface::Function>,
-    allow_missing_imports: bool,
+	allow_missing_imports: bool,
 ) -> error::Result<Vec<u8>> {
 	let instance = wasm_runtime::create_wasm_runtime_with_code(
 		execution_method,
 		heap_pages,
 		code,
 		host_functions,
-        allow_missing_imports,
+		allow_missing_imports,
 	)?;
 
 	// It is safe, as we delete the instance afterwards.

client/executor/src/native_executor.rs

@@ -272,6 +272,7 @@ impl<D: NativeExecutionDispatch> sp_core::traits::CallInWasm for NativeExecutor<
 			wasm_blob,
 			self.default_heap_pages,
 			(*self.host_functions).clone(),
+			false,
 		).map_err(|e| e.to_string())
 	}
 }

client/executor/wasmi/src/lib.rs

@@ -607,7 +607,6 @@ impl WasmRuntime for WasmiRuntime {
 				e
 			})?;
 		call_in_wasm_module(
-			ext,
 			&self.instance,
 			method,
 			data,

client/service/src/builder.rs

@@ -148,7 +148,7 @@ pub fn new_full_client<TBl, TRtApi, TExecDisp, TCfg, TGen, TCSExt>(
 	config: &Configuration<TCfg, TGen, TCSExt>,
 ) -> Result<TFullClient<TBl, TRtApi, TExecDisp>, Error> where
 	TBl: BlockT,
-	TExecDisp: NativeExecutionDispatch,
+	TExecDisp: NativeExecutionDispatch + 'static,
 	TGen: sp_runtime::BuildStorage + serde::Serialize + for<'de> serde::Deserialize<'de>,
 	TCSExt: Extension,
 {
@@ -159,7 +159,7 @@ fn new_full_parts<TBl, TRtApi, TExecDisp, TCfg, TGen, TCSExt>(
 	config: &Configuration<TCfg, TGen, TCSExt>,
 ) -> Result<TFullParts<TBl, TRtApi, TExecDisp>,	Error> where
 	TBl: BlockT,
-	TExecDisp: NativeExecutionDispatch,
+	TExecDisp: NativeExecutionDispatch + 'static,
 	TGen: sp_runtime::BuildStorage + serde::Serialize + for<'de> serde::Deserialize<'de>,
 	TCSExt: Extension,
 {

client/src/light/call_executor.rs

@@ -181,8 +181,8 @@ pub fn prove_execution<Block, S, E>(
 ) -> ClientResult<(Vec<u8>, StorageProof)>
 	where
 		Block: BlockT,
-		S: StateBackend<HasherFor<Block>> + 'static,
-		E: CallExecutor<Block>,
+		S: StateBackend<HasherFor<Block>>,
+		E: CallExecutor<Block> + 'static,
 {
 	let trie_state = state.as_trie_backend()
 		.ok_or_else(||

primitives/version/src/lib.rs

@@ -28,6 +28,8 @@ use std::collections::HashSet;
 use codec::{Encode, Decode};
 use sp_runtime::RuntimeString;
 pub use sp_runtime::create_runtime_str;
+#[doc(hidden)]
+pub use sp_std;
 
 #[cfg(feature = "std")]
 use sp_runtime::{traits::Block as BlockT, generic::BlockId};

test-utils/client/src/client_ext.rs

@@ -64,7 +64,7 @@ pub trait ClientBlockImportExt<Block: BlockT>: Sized {
 impl<B, E, RA, Block> ClientExt<Block> for Client<B, E, Block, RA>
 	where
 		B: sc_client_api::backend::Backend<Block>,
-		E: sc_client::CallExecutor<Block>,
+		E: sc_client::CallExecutor<Block> + 'static,
 		Self: BlockImport<Block, Error = ConsensusError>,
 		Block: BlockT,
 {