add impls for references

aleph-client/src/connections.rs

@@ -40,7 +40,7 @@ pub trait AsConnection: Sync {
 }
 
 pub trait AsSigned: Sync {
-    fn as_signed(&self) -> SignedConnection;
+    fn as_signed(&self) -> &SignedConnection;
 }
 
 #[async_trait::async_trait]
@@ -74,9 +74,9 @@ pub struct SignedConnection {
     signer: KeyPair,
 }
 
+#[derive(Clone)]
 pub struct RootConnection {
-    connection: Connection,
-    root: KeyPair,
+    connection: SignedConnection,
 }
 
 #[async_trait::async_trait]
@@ -117,16 +117,13 @@ impl Clone for SignedConnection {
     }
 }
 
-impl Clone for RootConnection {
-    fn clone(&self) -> Self {
-        RootConnection {
-            connection: self.connection.clone(),
-            root: KeyPair::new(self.root.signer().clone()),
-        }
+impl AsConnection for Connection {
+    fn as_connection(&self) -> &Connection {
+        self
     }
 }
 
-impl AsConnection for Connection {
+impl AsConnection for &Connection {
     fn as_connection(&self) -> &Connection {
         self
     }
@@ -138,24 +135,45 @@ impl AsConnection for SignedConnection {
     }
 }
 
-impl AsConnection for RootConnection {
+impl AsConnection for &SignedConnection {
     fn as_connection(&self) -> &Connection {
         &self.connection
     }
 }
 
+impl AsConnection for RootConnection {
+    fn as_connection(&self) -> &Connection {
+        self.connection.as_connection()
+    }
+}
+
+impl AsConnection for &RootConnection {
+    fn as_connection(&self) -> &Connection {
+        self.connection.as_connection()
+    }
+}
+
 impl AsSigned for SignedConnection {
-    fn as_signed(&self) -> SignedConnection {
-        self.clone()
+    fn as_signed(&self) -> &SignedConnection {
+        self
+    }
+}
+
+impl AsSigned for &SignedConnection {
+    fn as_signed(&self) -> &SignedConnection {
+        self
     }
 }
 
 impl AsSigned for RootConnection {
-    fn as_signed(&self) -> SignedConnection {
-        SignedConnection {
-            connection: self.connection.clone(),
-            signer: KeyPair::new(self.root.signer().clone()),
-        }
+    fn as_signed(&self) -> &SignedConnection {
+        &self.connection
+    }
+}
+
+impl AsSigned for &RootConnection {
+    fn as_signed(&self) -> &SignedConnection {
+        &self.connection
     }
 }
 
@@ -297,8 +315,7 @@ impl RootConnection {
         }
 
         Ok(Self {
-            connection,
-            root: signer,
+            connection: SignedConnection { connection, signer },
         })
     }
 }

benches/payout-stakers/src/main.rs

@@ -151,7 +151,7 @@ async fn setup_test_validators_and_nominator_stashes(
     for (validator_index, validator) in validators.into_iter().enumerate() {
         let (nominator_controller_accounts, nominator_stash_accounts) =
             generate_nominator_accounts_with_minimal_bond(
-                &connection.as_signed(),
+                connection.as_signed(),
                 validator_index as u32,
                 validators_len as u32,
             )

e2e-tests/src/test/electing_validators.rs

@@ -179,7 +179,7 @@ pub async fn authorities_are_staking() -> anyhow::Result<()> {
 
     let desired_validator_count = reserved_seats + non_reserved_seats;
     let accounts = setup_accounts(desired_validator_count);
-    prepare_validators(&root_connection.as_signed(), node, &accounts).await?;
+    prepare_validators(root_connection.as_signed(), node, &accounts).await?;
     info!("New validators are set up");
 
     let reserved_validators = accounts.get_stash_accounts()[..reserved_seats as usize].to_vec();