Merge branch 'main' into A0-1614-hide-subxt-types

aleph-client/src/connections.rs

@@ -13,8 +13,8 @@ use subxt::{
 };
 
 use crate::{
-    api, sp_weights::weight_v2::Weight, AccountId, BlockHash, Call, KeyPair, ParamsBuilder,
-    RpcCallParams, SubxtClient, TxStatus,
+    api, sp_weights::weight_v2::Weight, AccountId, AlephConfig, BlockHash, Call, KeyPair,
+    ParamsBuilder, RpcCallParams, SubxtClient, TxHash, TxStatus,
 };
 
 /// Capable of communicating with a live Aleph chain.

aleph-client/src/contract/convertible_value.rs

@@ -230,7 +230,7 @@ mod tests {
         let cast: bool = ConvertibleValue(Bool(true))
             .try_into()
             .expect("Should cast successfully");
-        assert_eq!(true, cast);
+        assert!(cast);
     }
 
     #[test]

aleph-client/src/lib.rs

@@ -48,14 +48,14 @@ pub type AlephKeyPair = ed25519::Pair;
 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 SubxtClient = OnlineClient<AlephConfig>;
-/// An alias for a hash type.
-pub type BlockHash = H256;
 /// An alias for a hash type.
 pub type CodeHash = H256;
-
-type PairSigner = subxt::tx::PairSigner<AlephConfig, RawKeyPair>;
+/// An alias for a block hash type.
+pub type BlockHash = H256;
+/// An alias for a transaction hash type.
+pub type TxHash = H256;
+/// An alias for an RPC client type.
+pub type SubxtClient = OnlineClient<AlephConfig>;
 
 pub use connections::{
     AsConnection, AsSigned, Connection, ConnectionApi, RootConnection, SignedConnection,
@@ -65,6 +65,7 @@ pub use connections::{
 /// An alias for a configuration of live chain, e.g. block index type, hash type.
 type AlephConfig = PolkadotConfig;
 type ParamsBuilder = subxt::tx::PolkadotExtrinsicParamsBuilder<SubstrateConfig>;
+type PairSigner = subxt::tx::PairSigner<AlephConfig, RawKeyPair>;
 
 /// Wrapped around subxt PairSigner
 pub struct KeyPair {

aleph-client/src/pallets/balances.rs

@@ -1,4 +1,3 @@
-use primitives::Balance;
 use subxt::ext::sp_runtime::MultiAddress;
 
 use crate::{

aleph-client/src/pallets/contract.rs

@@ -3,8 +3,8 @@ use pallet_contracts_primitives::ContractExecResult;
 use subxt::{ext::sp_core::Bytes, rpc_params};
 
 use crate::{
-    api, pallet_contracts::wasm::OwnerInfo, sp_weights::weight_v2::Weight, AccountId, BlockHash,
-    CodeHash, ConnectionApi, RpcCallParams, SignedConnectionApi, TxStatus,
+    api, pallet_contracts::wasm::OwnerInfo, sp_weights::weight_v2::Weight, AccountId, Balance,
+    BlockHash, CodeHash, ConnectionApi, RpcCallParams, SignedConnectionApi, TxInfo, TxStatus,
 };
 
 /// Arguments to [`ContractRpc::call_and_get`].
@@ -83,8 +83,7 @@ pub trait ContractsUserApi {
     ) -> anyhow::Result<TxInfo>;
 
     /// API for [`remove_code`](https://paritytech.github.io/substrate/master/pallet_contracts/pallet/struct.Pallet.html#method.remove_code) call.
-    async fn remove_code(&self, code_hash: CodeHash, status: TxStatus)
-        -> anyhow::Result<BlockHash>;
+    async fn remove_code(&self, code_hash: BlockHash, status: TxStatus) -> anyhow::Result<TxInfo>;
 }
 
 /// RPC for runtime ContractsApi
@@ -183,11 +182,7 @@ impl<S: SignedConnectionApi> ContractsUserApi for S {
         self.send_tx(tx, status).await
     }
 
-    async fn remove_code(
-        &self,
-        code_hash: CodeHash,
-        status: TxStatus,
-    ) -> anyhow::Result<BlockHash> {
+    async fn remove_code(&self, code_hash: BlockHash, status: TxStatus) -> anyhow::Result<TxInfo> {
         let tx = api::tx().contracts().remove_code(code_hash);
 
         self.send_tx(tx, status).await