Clone for KeyPair + removing pub(crate)

aleph-client/src/connections.rs

@@ -22,6 +22,7 @@ pub struct Connection {
 }
 
 /// Any connection that is signed by some key.
+#[derive(Clone)]
 pub struct SignedConnection {
     connection: Connection,
     signer: KeyPair,
@@ -182,15 +183,6 @@ impl SudoCall for RootConnection {
     }
 }
 
-impl Clone for SignedConnection {
-    fn clone(&self) -> Self {
-        SignedConnection {
-            connection: self.connection.clone(),
-            signer: KeyPair::new(self.signer.signer().clone()),
-        }
-    }
-}
-
 impl AsConnection for Connection {
     fn as_connection(&self) -> &Connection {
         self

aleph-client/src/lib.rs

@@ -47,27 +47,33 @@ pub type RawKeyPair = sr25519::Pair;
 /// An alias for an account id type.
 pub type AccountId = subxt::ext::sp_core::crypto::AccountId32;
 /// An alias for a client type.
-pub type Client = OnlineClient<AlephConfig>;
+pub type SubxtClient = OnlineClient<AlephConfig>;
 /// An alias for a hash type.
 pub type BlockHash = H256;
 /// An alias for a hash type.
 pub type CodeHash = H256;
 
-/// An alias for a configuration of live chain, e.g. block index type, hash type.
-pub(crate) type AlephConfig = PolkadotConfig;
-pub(crate) type ParamsBuilder = subxt::tx::PolkadotExtrinsicParamsBuilder<SubstrateConfig>;
-pub(crate) type SubxtClient = OnlineClient<AlephConfig>;
 type PairSigner = subxt::tx::PairSigner<AlephConfig, RawKeyPair>;
 
 pub use connections::{
     Connection, ConnectionApi, RootConnection, SignedConnection, SignedConnectionApi, SudoCall,
 };
 
+/// An alias for a configuration of live chain, e.g. block index type, hash type.
+type AlephConfig = PolkadotConfig;
+type ParamsBuilder = subxt::tx::PolkadotExtrinsicParamsBuilder<SubstrateConfig>;
+
 /// Wrapped around subxt PairSigner
 pub struct KeyPair {
     inner: PairSigner,
 }
 
+impl Clone for KeyPair {
+    fn clone(&self) -> Self {
+        KeyPair::new(self.inner.signer().clone())
+    }
+}
+
 impl KeyPair {
     /// Constructs a new KeyPair from RawKeyPair
     pub fn new(keypair: RawKeyPair) -> Self {