separate alias for code hash

aleph-client/src/lib.rs

@@ -28,6 +28,7 @@ pub type KeyPair = PairSigner<AlephConfig, sr25519::Pair>;
 pub type AccountId = subxt::ext::sp_core::crypto::AccountId32;
 pub type Client = OnlineClient<AlephConfig>;
 pub type BlockHash = H256;
+pub type CodeHash = H256;
 
 pub use connections::{Connection, RootConnection, SignedConnection, SudoCall};
 

aleph-client/src/pallets/contract.rs

@@ -8,7 +8,7 @@ use subxt::{
 
 use crate::{
     api, pallet_contracts::wasm::OwnerInfo, sp_weights::weight_v2::Weight, AccountId, BlockHash,
-    Connection, SignedConnection, TxStatus,
+    CodeHash, Connection, SignedConnection, TxStatus,
 };
 
 #[derive(Encode)]
@@ -23,11 +23,8 @@ pub struct ContractCallArgs {
 
 #[async_trait::async_trait]
 pub trait ContractsApi {
-    async fn get_owner_info(
-        &self,
-        code_hash: BlockHash,
-        at: Option<BlockHash>,
-    ) -> Option<OwnerInfo>;
+    async fn get_owner_info(&self, code_hash: CodeHash, at: Option<BlockHash>)
+        -> Option<OwnerInfo>;
 }
 
 #[async_trait::async_trait]
@@ -41,7 +38,7 @@ pub trait ContractsUserApi {
     #[allow(clippy::too_many_arguments)]
     async fn instantiate(
         &self,
-        code_hash: BlockHash,
+        code_hash: CodeHash,
         balance: Balance,
         gas_limit: Weight,
         storage_limit: Option<Compact<u128>>,
@@ -69,11 +66,8 @@ pub trait ContractsUserApi {
         data: Vec<u8>,
         status: TxStatus,
     ) -> anyhow::Result<BlockHash>;
-    async fn remove_code(
-        &self,
-        code_hash: BlockHash,
-        status: TxStatus,
-    ) -> anyhow::Result<BlockHash>;
+    async fn remove_code(&self, code_hash: CodeHash, status: TxStatus)
+        -> anyhow::Result<BlockHash>;
 }
 
 #[async_trait::async_trait]
@@ -85,7 +79,7 @@ pub trait ContractRpc {
 impl ContractsApi for Connection {
     async fn get_owner_info(
         &self,
-        code_hash: BlockHash,
+        code_hash: CodeHash,
         at: Option<BlockHash>,
     ) -> Option<OwnerInfo> {
         let addrs = api::storage().contracts().owner_info_of(code_hash);
@@ -109,7 +103,7 @@ impl ContractsUserApi for SignedConnection {
 
     async fn instantiate(
         &self,
-        code_hash: BlockHash,
+        code_hash: CodeHash,
         balance: Balance,
         gas_limit: Weight,
         storage_limit: Option<Compact<u128>>,
@@ -172,7 +166,7 @@ impl ContractsUserApi for SignedConnection {
 
     async fn remove_code(
         &self,
-        code_hash: BlockHash,
+        code_hash: CodeHash,
         status: TxStatus,
     ) -> anyhow::Result<BlockHash> {
         let tx = api::tx().contracts().remove_code(code_hash);

bin/cliain/src/contracts.rs

@@ -9,14 +9,13 @@ use aleph_client::{
     pallets::contract::{ContractsApi, ContractsUserApi},
     sp_weights::weight_v2::Weight,
     waiting::{AlephWaiting, BlockStatus},
-    AccountId, Connection, SignedConnection, TxStatus,
+    AccountId, CodeHash, Connection, SignedConnection, TxStatus,
 };
 use codec::{Compact, Decode};
 use contract_metadata::ContractMetadata;
 use contract_transcode::ContractMessageTranscoder;
 use log::{debug, info};
 use serde::{Deserialize, Serialize};
-use subxt::ext::sp_core::H256;
 
 use crate::commands::{
     ContractCall, ContractInstantiate, ContractInstantiateWithCode, ContractOptions,
@@ -26,7 +25,7 @@ use crate::commands::{
 #[derive(Debug, Decode, Clone, Serialize, Deserialize)]
 pub struct InstantiateWithCodeReturnValue {
     pub contract: AccountId,
-    pub code_hash: H256,
+    pub code_hash: CodeHash,
 }
 
 fn storage_deposit(storage_deposit_limit: Option<u128>) -> Option<Compact<u128>> {