From a2e770881935c63e97ccb3c60b9db7a140f83f41 Mon Sep 17 00:00:00 2001 From: Niklas Adolfsson Date: Mon, 12 Apr 2021 09:54:30 +0200 Subject: [PATCH 1/2] [jsonrpsee http client]: support tokio1 & tokio02. --- Cargo.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c916dda7c2..471c694cb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,8 +17,11 @@ keywords = ["parity", "substrate", "blockchain"] include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [features] -default = [] +default = ["tokio1"] client = ["substrate-subxt-client"] +# jsonrpsee http client can be configured to use tokio02 or tokio1. +tokio02 = ["jsonrpsee-http-client/tokio02"] +tokio1 = ["jsonrpsee-http-client/tokio1"] [dependencies] log = "0.4.14" @@ -26,7 +29,7 @@ thiserror = "1.0.24" futures = "0.3.13" jsonrpsee-types = "=0.2.0-alpha.3" jsonrpsee-ws-client = "=0.2.0-alpha.3" -jsonrpsee-http-client = "=0.2.0-alpha.3" +jsonrpsee-http-client = { version = "=0.2.0-alpha.3", default-features = false, optional = true } num-traits = { version = "0.2.14", default-features = false } serde = { version = "1.0.124", features = ["derive"] } serde_json = "1.0.64" From da6cb9f026803eebf4607625dd6e778105ab627b Mon Sep 17 00:00:00 2001 From: Niklas Adolfsson Date: Mon, 12 Apr 2021 10:31:48 +0200 Subject: [PATCH 2/2] review grumbles: http client make non-optional --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 471c694cb3..4df8705ac4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ thiserror = "1.0.24" futures = "0.3.13" jsonrpsee-types = "=0.2.0-alpha.3" jsonrpsee-ws-client = "=0.2.0-alpha.3" -jsonrpsee-http-client = { version = "=0.2.0-alpha.3", default-features = false, optional = true } +jsonrpsee-http-client = { version = "=0.2.0-alpha.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } serde = { version = "1.0.124", features = ["derive"] } serde_json = "1.0.64"