rename client

aleph-client/src/connections.rs

@@ -12,18 +12,7 @@ use subxt::{
     SubstrateConfig,
 };
 
-use crate::{api, sp_weights::weight_v2::Weight, BlockHash, Call, Client, KeyPair, TxStatus};
-
-#[derive(Clone)]
-pub struct Connection {
-    client: Client,
-}
-
-impl Connection {
-    pub(crate) fn as_client(&self) -> &Client {
-        &self.client
-    }
-}
+use crate::{api, sp_weights::weight_v2::Weight, BlockHash, Call, KeyPair, SubxtClient, TxStatus};
 
 const DEFAULT_RETRIES: u32 = 10;
 const RETRY_WAIT_SECS: u64 = 1;
@@ -34,7 +23,7 @@ pub async fn create_connection(address: &str) -> Connection {
 
 async fn create_connection_with_retries(address: &str, mut retries: u32) -> Connection {
     loop {
-        let client = Client::from_url(&address).await;
+        let client = SubxtClient::from_url(&address).await;
         match (retries, client) {
             (_, Ok(client)) => return Connection { client },
             (0, Err(e)) => panic!("{:?}", e),
@@ -71,6 +60,11 @@ pub trait ConnectionExt: AsConnection {
     async fn rpc_call<R: Decode>(&self, func_name: String, params: RpcParams) -> anyhow::Result<R>;
 }
 
+#[derive(Clone)]
+pub struct Connection {
+    client: SubxtClient,
+}
+
 pub struct SignedConnection {
     connection: Connection,
     signer: KeyPair,
@@ -171,6 +165,12 @@ impl<C: AsConnection> ConnectionExt for C {
     }
 }
 
+impl Connection {
+    pub(crate) fn as_client(&self) -> &SubxtClient {
+        &self.client
+    }
+}
+
 impl SignedConnection {
     pub async fn new(address: &str, signer: KeyPair) -> Self {
         Self::from_connection(create_connection(address).await, signer)

aleph-client/src/lib.rs

@@ -28,7 +28,7 @@ pub type KeyPair = PairSigner<AlephConfig, sr25519::Pair>;
 pub type AccountId = subxt::ext::sp_core::crypto::AccountId32;
 pub type BlockHash = H256;
 
-pub(crate) type Client = OnlineClient<AlephConfig>;
+pub(crate) type SubxtClient = OnlineClient<AlephConfig>;
 
 pub use connections::{
     create_connection, AsConnection, Connection, ConnectionExt, RootConnection, SignedConnection,