Merge branch 'master' into bernhard-errors-with-info

* master:
  Expose the backend from a full node (#1852)
  fix compilation on nightly (#1850)

node/service/src/lib.rs

@@ -264,7 +264,13 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration) -> Result<
 	};
 
 	Ok(service::PartialComponents {
-		client, backend, task_manager, keystore_container, select_chain, import_queue, transaction_pool,
+		client,
+		backend,
+		task_manager,
+		keystore_container,
+		select_chain,
+		import_queue,
+		transaction_pool,
 		inherent_data_providers,
 		other: (rpc_extensions_builder, import_setup, rpc_setup)
 	})
@@ -309,6 +315,7 @@ pub struct NewFull<C> {
 	pub network: Arc<sc_network::NetworkService<Block, <Block as BlockT>::Hash>>,
 	pub network_status_sinks: service::NetworkStatusSinks<Block>,
 	pub rpc_handlers: RpcHandlers,
+	pub backend: Arc<FullBackend>,
 }
 
 #[cfg(feature = "full-node")]
@@ -322,6 +329,7 @@ impl<C> NewFull<C> {
 			network: self.network,
 			network_status_sinks: self.network_status_sinks,
 			rpc_handlers: self.rpc_handlers,
+			backend: self.backend,
 		}
 	}
 }
@@ -566,6 +574,7 @@ pub fn new_full<RuntimeApi, Executor>(
 		network,
 		network_status_sinks,
 		rpc_handlers,
+		backend,
 	})
 }
 

node/test/service/src/lib.rs

@@ -157,6 +157,7 @@ pub fn node_config(
 		pruning: Default::default(),
 		chain_spec: Box::new(spec),
 		wasm_method: WasmExecutionMethod::Interpreted,
+		wasm_runtime_overrides: Default::default(),
 		// NOTE: we enforce the use of the native runtime to make the errors more debuggable
 		execution_strategies: ExecutionStrategies {
 			syncing: sc_client_api::ExecutionStrategy::NativeWhenPossible,