Skip to content

Commit

Permalink
Update to jsonrpsee 0.5.1 (#332)
Browse files Browse the repository at this point in the history
* Update to jsonrpsee 0.5.1

* Use jsonrpsee wrapper crate
  • Loading branch information
ascjones authored Nov 26, 2021
1 parent e2ab01d commit 7e26f95
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 23 deletions.
5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
36 changes: 19 additions & 17 deletions src/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/subscription.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with subxt. If not, see <http://www.gnu.org/licenses/>.

use jsonrpsee_types::{
use jsonrpsee::types::{
DeserializeOwned,
Subscription,
};
Expand Down

0 comments on commit 7e26f95

Please sign in to comment.