async mutex

utils/frame/remote-externalities/Cargo.toml

@@ -15,6 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 env_logger = "0.9"
+futures = "0.3.21"
 jsonrpsee = { version = "0.15.1", features = ["ws-client", "macros"] }
 log = "0.4.17"
 serde = "1.0.136"

utils/frame/remote-externalities/src/rpc_api.rs

@@ -26,7 +26,8 @@ use jsonrpsee::{
 };
 use serde::de::DeserializeOwned;
 use sp_runtime::{generic::SignedBlock, traits::Block as BlockT};
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
+use futures::lock::Mutex;
 
 enum RpcCall {
 	GetHeader,
@@ -103,7 +104,7 @@ impl RpcService {
 		call: RpcCall,
 		params: Option<ParamsSer<'a>>,
 	) -> Result<T, String> {
-		let mut maybe_client = self.client.lock().unwrap();
+		let mut maybe_client = self.client.lock().await;
 		match *maybe_client {
 			// `self.keep_connection` must be `true.
 			Some(ref client) => make_request(client, call, params).await,

utils/frame/try-runtime/cli/src/commands/follow_chain.rs

@@ -330,13 +330,13 @@ where
 mod tests {
 	use super::*;
 	use sp_runtime::testing::{Block as TBlock, ExtrinsicWrapper, Header};
-	use std::cell::Cell;
+	use std::cell::RefCell;
 
 	type Block = TBlock<ExtrinsicWrapper<()>>;
 	type BlockNumber = u64;
 	type Hash = H256;
 
-	struct MockHeaderProvider(pub Cell<VecDeque<BlockNumber>>);
+	struct MockHeaderProvider(pub RefCell<VecDeque<BlockNumber>>);
 
 	fn headers() -> Vec<Header> {
 		let mut headers = vec![Header::new_from_number(0)];
@@ -352,7 +352,7 @@ mod tests {
 	#[async_trait]
 	impl HeaderProvider<Block> for MockHeaderProvider {
 		async fn get_header(&self, _hash: Hash) -> Header {
-			let height = self.0.get().pop_front().unwrap();
+			let height = self.0.borrow().pop_front().unwrap();
 			headers()[height as usize].clone()
 		}
 	}
@@ -370,7 +370,7 @@ mod tests {
 	async fn finalized_headers_works_when_every_block_comes_from_subscription() {
 		let heights = vec![4, 5, 6, 7];
 
-		let provider = MockHeaderProvider(Cell::new(vec![].into()));
+		let provider = MockHeaderProvider(RefCell::new(vec![].into()));
 		let subscription = MockHeaderSubscription(heights.clone().into());
 		let mut headers = FinalizedHeaders::new(&provider, subscription);
 
@@ -387,7 +387,7 @@ mod tests {
 		// Consecutive headers will be requested in the reversed order.
 		let heights_not_in_subscription = vec![5, 9, 8, 7];
 
-		let provider = MockHeaderProvider(Cell::new(heights_not_in_subscription.into()));
+		let provider = MockHeaderProvider(RefCell::new(heights_not_in_subscription.into()));
 		let subscription = MockHeaderSubscription(heights_in_subscription.into());
 		let mut headers = FinalizedHeaders::new(&provider, subscription);