change TreasurySudoApi

aleph-client/src/lib.rs

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

aleph-client/src/pallets/treasury.rs

@@ -9,7 +9,7 @@ use crate::{
     pallets::{elections::ElectionsApi, staking::StakingApi},
     AccountId, BlockHash,
     Call::Treasury,
-    ConnectionApi, RootConnection, SignedConnection, SignedConnectionApi, SudoCall, TxStatus,
+    ConnectionApi, RootConnection, SignedConnectionApi, SudoCall, TxStatus,
 };
 
 #[async_trait::async_trait]
@@ -62,7 +62,7 @@ impl<C: ConnectionApi> TreasuryApi for C {
 }
 
 #[async_trait::async_trait]
-impl TreasuryUserApi for SignedConnection {
+impl<S: SignedConnectionApi> TreasuryUserApi for S {
     async fn propose_spend(
         &self,
         amount: Balance,

bin/cliain/src/keys.rs

@@ -5,7 +5,7 @@ use aleph_client::{
         session::{SessionApi, SessionUserApi},
         staking::StakingUserApi,
     },
-    AccountId, AsSigned, Connection, RootConnection, SignedConnection, TxStatus,
+    AccountId, Connection, RootConnection, SignedConnection, TxStatus,
 };
 use hex::ToHex;
 use log::{error, info};
@@ -26,9 +26,7 @@ pub async fn prepare_keys(
         .await
         .unwrap();
     let new_keys = connection.author_rotate_keys().await?;
-    connection
-        .set_keys(new_keys, TxStatus::Finalized)
-        .await?;
+    connection.set_keys(new_keys, TxStatus::Finalized).await?;
     Ok(())
 }
 

bin/cliain/src/lib.rs

@@ -13,9 +13,7 @@ mod validators;
 mod version_upgrade;
 mod vesting;
 
-use aleph_client::{
-    keypair_from_string, Connection, RootConnection, SignedConnection,
-};
+use aleph_client::{keypair_from_string, Connection, RootConnection, SignedConnection};
 pub use commands::Command;
 pub use contracts::{
     call, instantiate, instantiate_with_code, owner_info, remove_code, upload_code,

bin/cliain/src/treasury.rs

@@ -19,15 +19,15 @@ pub async fn propose(connection: SignedConnection, amount_in_tokens: u64, benefi
 /// Delegates to `aleph_client::approve_treasury_proposal`.
 pub async fn approve(connection: RootConnection, proposal_id: u32) {
     connection
-        .approve(proposal_id, TxStatus::Finalized)
+        .sudo_approve(proposal_id, TxStatus::Finalized)
         .await
         .unwrap();
 }
 
 /// Delegates to `aleph_client::reject_treasury_proposal`.
 pub async fn reject(connection: RootConnection, proposal_id: u32) {
     connection
-        .reject(proposal_id, TxStatus::Finalized)
+        .sudo_reject(proposal_id, TxStatus::Finalized)
         .await
         .unwrap();
 }

e2e-tests/src/test/treasury.rs

@@ -133,7 +133,7 @@ pub async fn treasury_access() -> anyhow::Result<()> {
 }
 
 async fn approve_treasury_proposal(connection: &RootConnection, id: u32) -> anyhow::Result<()> {
-    connection.sudo_approve(id, TxStatus::Finalized).await?;
+    connection.approve(id, TxStatus::Finalized).await?;
     let approvals = connection.approvals(None).await;
     assert!(approvals.contains(&id));
 
@@ -150,7 +150,7 @@ async fn reject_treasury_proposal(connection: &RootConnection, id: u32) -> anyho
             )
             .await;
     });
-    connection.sudo_reject(id, TxStatus::Finalized).await?;
+    connection.reject(id, TxStatus::Finalized).await?;
     handle.await?;
 
     Ok(())