Merge branch 'master' into davxy/remove-leaves

polkadot-parachain/src/service.rs

@@ -30,8 +30,8 @@ use cumulus_primitives_core::{
 };
 use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain;
 use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult};
-use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface;
-use polkadot_service::{CollatorPair, FullBackend};
+use cumulus_relay_chain_rpc_interface::{create_client_and_start_worker, RelayChainRpcInterface};
+use polkadot_service::CollatorPair;
 use sp_core::Pair;
 
 use jsonrpsee::RpcModule;
@@ -508,7 +508,9 @@ where
 
 // ========= START TEMPORARY HACK =========
 
+use polkadot_service::FullBackend;
 use std::sync::Mutex as StdMutex;
+
 lazy_static::lazy_static! {
 	static ref BACKEND: StdMutex<Option<Arc<FullBackend>>> = StdMutex::new(None);
 }