Unverified Commit 13c52fed authored by Zeke Mostov's avatar Zeke Mostov Committed by GitHub
Browse files

Upgrade staking-miner to use jsonrpsee v0.3 (#3466)

parent 8a6af441
Pipeline #147446 passed with stages
in 46 minutes and 13 seconds
......@@ -3234,12 +3234,6 @@ dependencies = [
"slab",
]
[[package]]
name = "jsonrpsee"
version = "0.2.0-alpha.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4e48ecdd757b22fae87e87aad2dbadf11c56499c6509763c8ef20db16ffb0e9"
[[package]]
name = "jsonrpsee-proc-macros"
version = "0.2.0"
......@@ -3271,6 +3265,24 @@ dependencies = [
"thiserror",
]
[[package]]
name = "jsonrpsee-types"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d67724d368c59e08b557a516cf8fcc51100e7a708850f502e1044b151fe89788"
dependencies = [
"async-trait",
"beef",
"futures-channel",
"futures-util",
"hyper 0.14.5",
"log",
"serde",
"serde_json",
"soketto 0.6.0",
"thiserror",
]
[[package]]
name = "jsonrpsee-ws-client"
version = "0.2.0"
......@@ -3280,7 +3292,7 @@ dependencies = [
"async-trait",
"fnv",
"futures 0.3.15",
"jsonrpsee-types",
"jsonrpsee-types 0.2.0",
"log",
"pin-project 1.0.7",
"rustls 0.19.1",
......@@ -3295,6 +3307,30 @@ dependencies = [
"url 2.2.0",
]
[[package]]
name = "jsonrpsee-ws-client"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e2834b6e7f57ce9a4412ed4d6dc95125d2c8612e68f86b9d9a07369164e4198"
dependencies = [
"async-trait",
"fnv",
"futures 0.3.15",
"jsonrpsee-types 0.3.0",
"log",
"pin-project 1.0.7",
"rustls 0.19.1",
"rustls-native-certs 0.5.0",
"serde",
"serde_json",
"soketto 0.6.0",
"thiserror",
"tokio 0.2.21",
"tokio-rustls 0.15.0",
"tokio-util",
"url 2.2.0",
]
[[package]]
name = "keccak"
version = "0.1.0"
......@@ -7782,7 +7818,7 @@ dependencies = [
"env_logger 0.8.4",
"hex",
"jsonrpsee-proc-macros",
"jsonrpsee-ws-client",
"jsonrpsee-ws-client 0.2.0",
"log",
"parity-scale-codec",
"serde",
......@@ -9518,6 +9554,21 @@ dependencies = [
"sha-1 0.9.6",
]
[[package]]
name = "soketto"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a74e48087dbeed4833785c2f3352b59140095dc192dce966a3bfc155020a439f"
dependencies = [
"base64 0.13.0",
"bytes 1.0.1",
"futures 0.3.15",
"httparse",
"log",
"rand 0.8.4",
"sha-1 0.9.6",
]
[[package]]
name = "sp-api"
version = "4.0.0-dev"
......@@ -10198,9 +10249,7 @@ dependencies = [
"frame-support",
"frame-system",
"hex",
"jsonrpsee",
"jsonrpsee-types",
"jsonrpsee-ws-client",
"jsonrpsee-ws-client 0.3.0",
"kusama-runtime",
"lazy_static",
"log",
......
......@@ -10,9 +10,7 @@ tokio = { version = "0.2", features = ["macros"] }
log = "0.4.11"
env_logger = "0.8.3"
structopt = "0.3.0"
jsonrpsee-ws-client = { version = "0.2.0", default-features = false, features = ["tokio02"] }
jsonrpsee-types = { version = "0.2.0" }
jsonrpsee = "=0.2.0-alpha.6"
jsonrpsee-ws-client = { version = "0.3.0", default-features = false, features = ["tokio02"] }
serde_json = "1.0"
serde = "1.0.0"
hex = "0.4.0"
......
......@@ -191,7 +191,7 @@ macro_rules! any_runtime {
#[derive(Debug, thiserror::Error)]
enum Error {
Io(#[from] std::io::Error),
Jsonrpsee(#[from] jsonrpsee_ws_client::Error),
Jsonrpsee(#[from] jsonrpsee_ws_client::types::Error),
Codec(#[from] codec::Error),
Crypto(sp_core::crypto::SecretStringError),
RemoteExternalities(&'static str),
......
......@@ -21,7 +21,8 @@ use crate::{
};
use codec::Encode;
use jsonrpsee_ws_client::{
traits::SubscriptionClient, v2::params::JsonRpcParams, Subscription, WsClient,
WsClient,
types::{Subscription, traits::SubscriptionClient, v2::params::JsonRpcParams},
};
use sc_transaction_pool_api::TransactionStatus;
......
......@@ -17,8 +17,8 @@
//! Helper method for RPC.
use super::*;
use jsonrpsee_ws_client::traits::Client;
pub(crate) use jsonrpsee_ws_client::v2::params::JsonRpcParams;
use jsonrpsee_ws_client::types::traits::Client;
pub(crate) use jsonrpsee_ws_client::types::v2::params::JsonRpcParams;
#[macro_export]
macro_rules! params {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment