diff --git a/Cargo.toml b/Cargo.toml index b9a9d96017..e826c58c14 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,10 +24,7 @@ chameleon = "0.1.0" scale-info = { version = "1.0.0", features = ["bit-vec"] } futures = "0.3.13" hex = "0.4.3" -jsonrpsee-proc-macros = "0.4.1" -jsonrpsee-ws-client = { version = "0.4.1", default-features = false } -jsonrpsee-http-client = { version = "0.4.1", default-features = false } -jsonrpsee-types = "0.4.1" +jsonrpsee = { version = "0.5.1", features = ["macros", "ws-client", "http-client"] } log = "0.4.14" num-traits = { version = "0.2.14", default-features = false } serde = { version = "1.0.124", features = ["derive"] } diff --git a/src/error.rs b/src/error.rs index 5fbfa1897c..f050b465a0 100644 --- a/src/error.rs +++ b/src/error.rs @@ -22,7 +22,7 @@ use crate::{ }, Metadata, }; -use jsonrpsee_types::Error as RequestError; +use jsonrpsee::types::Error as RequestError; use sp_core::crypto::SecretStringError; use sp_runtime::{ transaction_validity::TransactionValidityError, diff --git a/src/rpc.rs b/src/rpc.rs index 6afc717d28..1543a6b228 100644 --- a/src/rpc.rs +++ b/src/rpc.rs @@ -33,24 +33,26 @@ use core::{ marker::PhantomData, }; use frame_metadata::RuntimeMetadataPrefixed; -use jsonrpsee_http_client::{ - HttpClient, - HttpClientBuilder, -}; -use jsonrpsee_types::{ - to_json_value, - traits::{ - Client, - SubscriptionClient, +use jsonrpsee::{ + http_client::{ + HttpClient, + HttpClientBuilder, + }, + types::{ + to_json_value, + traits::{ + Client, + SubscriptionClient, + }, + DeserializeOwned, + Error as RpcError, + JsonValue, + Subscription, + }, + ws_client::{ + WsClient, + WsClientBuilder, }, - DeserializeOwned, - Error as RpcError, - JsonValue, - Subscription, -}; -use jsonrpsee_ws_client::{ - WsClient, - WsClientBuilder, }; use serde::{ Deserialize, diff --git a/src/subscription.rs b/src/subscription.rs index 0e7b090f88..c35771c27b 100644 --- a/src/subscription.rs +++ b/src/subscription.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with subxt. If not, see . -use jsonrpsee_types::{ +use jsonrpsee::types::{ DeserializeOwned, Subscription, };