Add AsSigned

aleph-client/src/connections.rs

@@ -39,6 +39,10 @@ pub trait AsConnection: Sync {
     fn as_connection(&self) -> &Connection;
 }
 
+pub trait AsSigned: Sync {
+    fn as_signed(&self) -> SignedConnection;
+}
+
 #[async_trait::async_trait]
 pub trait ConnectionExt: AsConnection {
     async fn get_storage_entry<T: DecodeWithMetadata + Sync, Defaultable: Sync, Iterable: Sync>(
@@ -140,6 +144,21 @@ impl AsConnection for RootConnection {
     }
 }
 
+impl AsSigned for SignedConnection {
+    fn as_signed(&self) -> SignedConnection {
+        self.clone()
+    }
+}
+
+impl AsSigned for RootConnection {
+    fn as_signed(&self) -> SignedConnection {
+        SignedConnection {
+            connection: self.connection.clone(),
+            signer: KeyPair::new(self.root.signer().clone()),
+        }
+    }
+}
+
 #[async_trait::async_trait]
 impl<C: AsConnection> ConnectionExt for C {
     async fn get_storage_entry<T: DecodeWithMetadata + Sync, Defaultable: Sync, Iterable: Sync>(
@@ -282,11 +301,4 @@ impl RootConnection {
             root: signer,
         })
     }
-
-    pub fn as_signed(&self) -> SignedConnection {
-        SignedConnection {
-            connection: self.connection.clone(),
-            signer: KeyPair::new(self.root.signer().clone()),
-        }
-    }
 }

aleph-client/src/lib.rs

@@ -35,8 +35,8 @@ pub type BlockHash = H256;
 pub(crate) type SubxtClient = OnlineClient<AlephConfig>;
 
 pub use connections::{
-    create_connection, AsConnection, Connection, ConnectionExt, RootConnection, SignedConnection,
-    SudoCall,
+    create_connection, AsConnection, AsSigned, Connection, ConnectionExt, RootConnection,
+    SignedConnection, SudoCall,
 };
 
 #[derive(Copy, Clone)]

aleph-client/src/pallets/staking.rs

@@ -20,9 +20,9 @@ use crate::{
     pallet_sudo::pallet::Call::sudo_as,
     pallets::utility::UtilityApi,
     sp_arithmetic::per_things::Perbill,
-    AccountId, BlockHash,
+    AccountId, AsSigned, BlockHash,
     Call::{Staking, Sudo},
-    ConnectionExt, RootConnection, SignedConnection, SudoCall, TxStatus,
+    ConnectionExt, RootConnection, SudoCall, TxStatus,
 };
 
 #[async_trait::async_trait]
@@ -192,7 +192,7 @@ impl<C: ConnectionExt> StakingApi for C {
 }
 
 #[async_trait::async_trait]
-impl StakingUserApi for SignedConnection {
+impl<S: AsSigned> StakingUserApi for S {
     async fn bond(
         &self,
         initial_stake: Balance,
@@ -205,7 +205,7 @@ impl StakingUserApi for SignedConnection {
             RewardDestination::Staked,
         );
 
-        self.send_tx(tx, status).await
+        self.as_signed().send_tx(tx, status).await
     }
 
     async fn validate(
@@ -220,7 +220,7 @@ impl StakingUserApi for SignedConnection {
             blocked: false,
         });
 
-        self.send_tx(tx, status).await
+        self.as_signed().send_tx(tx, status).await
     }
 
     async fn payout_stakers(
@@ -231,7 +231,7 @@ impl StakingUserApi for SignedConnection {
     ) -> anyhow::Result<BlockHash> {
         let tx = api::tx().staking().payout_stakers(stash_account, era);
 
-        self.send_tx(tx, status).await
+        self.as_signed().send_tx(tx, status).await
     }
 
     async fn nominate(
@@ -243,13 +243,13 @@ impl StakingUserApi for SignedConnection {
             .staking()
             .nominate(vec![MultiAddress::Id(nominee_account_id)]);
 
-        self.send_tx(tx, status).await
+        self.as_signed().send_tx(tx, status).await
     }
 
     async fn chill(&self, status: TxStatus) -> anyhow::Result<BlockHash> {
         let tx = api::tx().staking().chill();
 
-        self.send_tx(tx, status).await
+        self.as_signed().send_tx(tx, status).await
     }
 
     async fn bond_extra_stake(
@@ -259,7 +259,7 @@ impl StakingUserApi for SignedConnection {
     ) -> anyhow::Result<BlockHash> {
         let tx = api::tx().staking().bond_extra(extra_stake);
 
-        self.send_tx(tx, status).await
+        self.as_signed().send_tx(tx, status).await
     }
 }
 

benches/payout-stakers/src/main.rs

@@ -7,7 +7,7 @@ use aleph_client::{
         staking::{StakingApi, StakingApiExt, StakingUserApi},
     },
     waiting::{BlockStatus, WaitingExt},
-    AccountId, ConnectionExt, KeyPair, RootConnection, SignedConnection, TxStatus,
+    AccountId, AsSigned, ConnectionExt, KeyPair, RootConnection, SignedConnection, TxStatus,
 };
 use clap::{ArgGroup, Parser};
 use futures::future::join_all;

bin/cliain/src/keys.rs

@@ -5,7 +5,7 @@ use aleph_client::{
         session::{SessionApi, SessionUserApi},
         staking::StakingUserApi,
     },
-    AccountId, Connection, RootConnection, SignedConnection, TxStatus,
+    AccountId, AsSigned, Connection, RootConnection, SignedConnection, TxStatus,
 };
 use hex::ToHex;
 use log::{error, info};

e2e-tests/src/rewards.rs

@@ -12,7 +12,7 @@ use aleph_client::{
     primitives::{CommitteeSeats, EraValidators},
     utility::BlocksApi,
     waiting::{AlephWaiting, BlockStatus, WaitingExt},
-    AccountId, SignedConnection, TxStatus,
+    AccountId, AsSigned, SignedConnection, TxStatus,
 };
 use anyhow::anyhow;
 use log::{debug, info};

e2e-tests/src/test/electing_validators.rs

@@ -8,7 +8,7 @@ use aleph_client::{
     },
     primitives::CommitteeSeats,
     waiting::{BlockStatus, WaitingExt},
-    AccountId, ConnectionExt, KeyPair, Pair, SignedConnection, TxStatus,
+    AccountId, AsSigned, ConnectionExt, KeyPair, Pair, SignedConnection, TxStatus,
 };
 use log::info;
 use primitives::EraIndex;

e2e-tests/src/test/staking.rs

@@ -11,7 +11,7 @@ use aleph_client::{
     primitives::CommitteeSeats,
     sp_core::bounded::bounded_vec::BoundedVec,
     waiting::{BlockStatus, WaitingExt},
-    AccountId, KeyPair, Pair, SignedConnection, TxStatus,
+    AccountId, AsSigned, KeyPair, Pair, SignedConnection, TxStatus,
 };
 use log::info;
 use primitives::{

e2e-tests/src/test/treasury.rs

@@ -7,7 +7,7 @@ use aleph_client::{
         treasury::{TreasureApiExt, TreasuryApi, TreasuryUserApi},
     },
     waiting::{AlephWaiting, BlockStatus},
-    AsConnection, ConnectionExt, KeyPair, RootConnection, SignedConnection, TxStatus,
+    AsConnection, AsSigned, ConnectionExt, KeyPair, RootConnection, SignedConnection, TxStatus,
 };
 use log::info;
 use primitives::Balance;