Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

expose jsonrpc-core client #672

Merged
merged 4 commits into from
Oct 4, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/examples/custom_rpc_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
// Pass this into our OnlineClient to instantiate it. This will lead to some
// RPC calls being made to fetch chain details/metadata, which will immediately
// fail..
let _ = OnlineClient::<PolkadotConfig>::from_rpc_client(rpc_client).await;
let _ = OnlineClient::<PolkadotConfig>::from_rpc_client(Arc::new(rpc_client)).await;

// But, we can see that the calls were made via our custom RPC client:
println!("Log of calls made:\n\n{}", log.lock().unwrap().as_str());
Expand Down
4 changes: 2 additions & 2 deletions subxt/src/client/online_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ impl<T: Config> OnlineClient<T> {
let client = jsonrpsee_helpers::ws_client(url.as_ref())
.await
.map_err(|e| crate::error::RpcError(e.to_string()))?;
OnlineClient::from_rpc_client(client).await
OnlineClient::from_rpc_client(Arc::new(client)).await
}
}

impl<T: Config> OnlineClient<T> {
/// Construct a new [`OnlineClient`] by providing an underlying [`RpcClientT`]
/// implementation to drive the connection.
pub async fn from_rpc_client<R: RpcClientT>(
rpc_client: R,
rpc_client: Arc<R>,
) -> Result<OnlineClient<T>, Error> {
let rpc = Rpc::new(rpc_client);

Expand Down
3 changes: 2 additions & 1 deletion subxt/src/rpc/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ use sp_runtime::{
ApplyExtrinsicResult,
};
use std::collections::HashMap;
use std::sync::Arc;

/// A number type that can be serialized both as a number or a string that encodes a number in a
/// string.
Expand Down Expand Up @@ -342,7 +343,7 @@ impl<T: Config> std::ops::Deref for Rpc<T> {

impl<T: Config> Rpc<T> {
/// Create a new [`Rpc`]
pub fn new<R: RpcClientT>(client: R) -> Self {
pub fn new<R: RpcClientT>(client: Arc<R>) -> Self {
Self {
client: RpcClient::new(client),
_marker: PhantomDataSendSync::new(),
Expand Down
4 changes: 2 additions & 2 deletions subxt/src/rpc/rpc_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ use std::{
pub struct RpcClient(Arc<dyn RpcClientT>);

impl RpcClient {
pub(crate) fn new<R: RpcClientT>(client: R) -> Self {
RpcClient(Arc::new(client))
pub(crate) fn new<R: RpcClientT>(client: Arc<R>) -> Self {
RpcClient(client)
}

/// Make an RPC request, given a method name and some parameters.
Expand Down