Upgrade jsonrpc to 0.18.0 (#9547)

* Upgrade jsonrpc to 0.18.0

I think this says all :P

* 🤦

* Fmt etc

* Fix tests

* Fix tests again...

* Better impl

* Revert "Tell dependabot to ignore jsonrpc-* updates (#9518)"

This reverts commit 6e0cd5587d.

substrate/bin/node/rpc-client/Cargo.toml

@@ -11,9 +11,8 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-futures = "0.1.29"
-hyper = "~0.12.35"
-jsonrpc-core-client = { version = "15.1.0", default-features = false, features = ["http"] }
+futures = "0.3.16"
+jsonrpc-core-client = { version = "18.0.0", default-features = false, features = ["http"] }
 log = "0.4.8"
 node-primitives = { version = "2.0.0", path = "../primitives" }
 sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }

substrate/bin/node/rpc-client/src/main.rs

@@ -22,24 +22,21 @@
 //! This module shows how you can write a Rust RPC client that connects to a running
 //! substrate node and use statically typed RPC wrappers.
 
-use futures::Future;
-use hyper::rt;
+use futures::{Future, TryFutureExt};
 use jsonrpc_core_client::{transports::http, RpcError};
 use node_primitives::Hash;
 use sc_rpc::author::{hash::ExtrinsicOrHash, AuthorClient};
 
-fn main() {
+fn main() -> Result<(), RpcError> {
 	sp_tracing::try_init_simple();
 
-	rt::run(rt::lazy(|| {
+	futures::executor::block_on(async {
 		let uri = "http://localhost:9933";
 
 		http::connect(uri)
 			.and_then(|client: AuthorClient<Hash, Hash>| remove_all_extrinsics(client))
-			.map_err(|e| {
-				println!("Error: {:?}", e);
-			})
-	}))
+			.await
+	})
 }
 
 /// Remove all pending extrinsics from the node.
@@ -52,7 +49,7 @@ fn main() {
 /// to be removed and the extrinsics are going to be temporarily banned.
 fn remove_all_extrinsics(
 	client: AuthorClient<Hash, Hash>,
-) -> impl Future<Item = (), Error = RpcError> {
+) -> impl Future<Output = Result<(), RpcError>> {
 	client
 		.pending_extrinsics()
 		.and_then(move |pending| {
@@ -60,7 +57,7 @@ fn remove_all_extrinsics(
 				pending.into_iter().map(|tx| ExtrinsicOrHash::Extrinsic(tx.into())).collect(),
 			)
 		})
-		.map(|removed| {
+		.map_ok(|removed| {
 			println!("Removed extrinsics: {:?}", removed);
 		})
 }