jsonrpsee v0.20

paritytech · Aug 30, 2023 · ad4d23e · ad4d23e
1 parent 43c0c09
commit ad4d23e
Show file tree

Hide file tree

Showing 112 changed files with 1,213 additions and 1,826 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -529,3 +529,6 @@ wasmi = { opt-level = 3 }
 x25519-dalek = { opt-level = 3 }
 yamux = { opt-level = 3 }
 zeroize = { opt-level = 3 }
+
+[patch.crates-io]
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-add-sync-subscription-with-some-hacks" }
diff --git a/cumulus/client/relay-chain-interface/Cargo.toml b/cumulus/client/relay-chain-interface/Cargo.toml
@@ -17,5 +17,5 @@ sc-client-api = { path = "../../../substrate/client/api" }
 futures = "0.3.28"
 async-trait = "0.1.73"
 thiserror = "1.0.47"
-jsonrpsee-core = "0.16.2"
+jsonrpsee-core = "0.20"
 parity-scale-codec = "3.6.4"
diff --git a/cumulus/client/relay-chain-rpc-interface/Cargo.toml b/cumulus/client/relay-chain-rpc-interface/Cargo.toml
@@ -28,7 +28,7 @@ tokio-util = { version = "0.7.8", features = ["compat"] }
 futures = "0.3.28"
 futures-timer = "3.0.2"
 parity-scale-codec = "3.6.4"
-jsonrpsee = { version = "0.16.2", features = ["ws-client"] }
+jsonrpsee = { version = "0.20.0", features = ["ws-client"] }
 tracing = "0.1.37"
 async-trait = "0.1.73"
 url = "2.4.0"

diff --git a/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs b/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs
@@ -200,12 +200,16 @@ impl RelayChainRpcClient {
 			))
 		})?;
 
-		let value = rx.await.map_err(|err| {
-			RelayChainError::WorkerCommunicationError(format!(
-				"Unexpected channel close on RPC worker side: {}",
-				err
-			))
-		})??;
+		// TODO(niklasad1): fix this.
+		let value = rx
+			.await
+			.map_err(|err| {
+				RelayChainError::WorkerCommunicationError(format!(
+					"Unexpected channel close on RPC worker side: {}",
+					err
+				))
+			})?
+			.unwrap();
 
 		serde_json::from_value(value).map_err(|_| {
 			trace_error(&RelayChainError::GenericError("Unable to deserialize value".to_string()));

diff --git a/cumulus/parachain-template/node/Cargo.toml b/cumulus/parachain-template/node/Cargo.toml
@@ -15,7 +15,7 @@ clap = { version = "4.4.1", features = ["derive"] }
 log = "0.4.20"
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 serde = { version = "1.0.188", features = ["derive"] }
-jsonrpsee = { version = "0.16.2", features = ["server"] }
+jsonrpsee = { version = "0.20.0", features = ["server"] }
 futures = "0.3.28"
 
 # Local

diff --git a/cumulus/polkadot-parachain/Cargo.toml b/cumulus/polkadot-parachain/Cargo.toml
@@ -34,7 +34,7 @@ bridge-hub-rococo-runtime = { path = "../parachains/runtimes/bridge-hubs/bridge-
 bridge-hub-kusama-runtime = { path = "../parachains/runtimes/bridge-hubs/bridge-hub-kusama" }
 bridge-hub-polkadot-runtime = { path = "../parachains/runtimes/bridge-hubs/bridge-hub-polkadot" }
 penpal-runtime = { path = "../parachains/runtimes/testing/penpal" }
-jsonrpsee = { version = "0.16.2", features = ["server"] }
+jsonrpsee = { version = "0.20.0", features = ["server"] }
 parachains-common = { path = "../parachains/common" }
 
 # Substrate

diff --git a/cumulus/test/service/Cargo.toml b/cumulus/test/service/Cargo.toml
@@ -14,7 +14,7 @@ async-trait = "0.1.73"
 clap = { version = "4.4.1", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 criterion = { version = "0.5.1", features = [ "async_tokio" ] }
-jsonrpsee = { version = "0.16.2", features = ["server"] }
+jsonrpsee = { version = "0.20.0", features = ["server"] }
 rand = "0.8.5"
 serde = { version = "1.0.188", features = ["derive"] }
 tokio = { version = "1.32.0", features = ["macros"] }