Move to lib

Author: pmikolajczyk41

aleph-client/src/connections.rs

@@ -3,9 +3,7 @@ use std::{thread::sleep, time::Duration};
 use anyhow::anyhow;
 use codec::Decode;
 use log::info;
-use serde::{Deserialize, Serialize};
 use subxt::{
-    blocks::ExtrinsicEvents,
     ext::sp_core::Bytes,
     metadata::DecodeWithMetadata,
     rpc::RpcParams,
@@ -15,8 +13,8 @@ use subxt::{
 };
 
 use crate::{
-    api, sp_weights::weight_v2::Weight, AccountId, AlephConfig, BlockHash, Call, KeyPair,
-    SubxtClient, TxHash, TxStatus,
+    api, sp_weights::weight_v2::Weight, AccountId, BlockHash, Call, KeyPair, SubxtClient, TxInfo,
+    TxStatus,
 };
 
 /// Capable of communicating with a live Aleph chain.
@@ -108,22 +106,6 @@ pub trait ConnectionApi: Sync {
     async fn rpc_call<R: Decode>(&self, func_name: String, params: RpcParams) -> anyhow::Result<R>;
 }
 
-/// Data regarding submitted transaction.
-#[derive(Copy, Clone, Eq, PartialEq, Debug, Default, Deserialize, Serialize)]
-pub struct TxInfo {
-    pub block_hash: BlockHash,
-    pub tx_hash: TxHash,
-}
-
-impl From<ExtrinsicEvents<AlephConfig>> for TxInfo {
-    fn from(ee: ExtrinsicEvents<AlephConfig>) -> Self {
-        Self {
-            block_hash: ee.extrinsic_hash(),
-            tx_hash: ee.block_hash(),
-        }
-    }
-}
-
 /// Signed connection should be able to sends transactions to chain
 #[async_trait::async_trait]
 pub trait SignedConnectionApi: ConnectionApi {

aleph-client/src/lib.rs

@@ -13,8 +13,10 @@
 extern crate core;
 
 pub use contract_transcode;
+use serde::{Deserialize, Serialize};
 pub use subxt::ext::sp_core::Pair;
 use subxt::{
+    blocks::ExtrinsicEvents,
     ext::sp_core::{ed25519, sr25519, H256},
     tx::PairSigner,
     OnlineClient, PolkadotConfig,
@@ -100,3 +102,21 @@ where
 {
     AccountId::from(keypair.public())
 }
+
+/// Data regarding submitted transaction.
+#[derive(Copy, Clone, Eq, PartialEq, Debug, Default, Deserialize, Serialize)]
+pub struct TxInfo {
+    /// Hash of the block that contains the transaction.
+    pub block_hash: BlockHash,
+    /// The hash of the transaction.
+    pub tx_hash: TxHash,
+}
+
+impl From<ExtrinsicEvents<AlephConfig>> for TxInfo {
+    fn from(ee: ExtrinsicEvents<AlephConfig>) -> Self {
+        Self {
+            block_hash: ee.extrinsic_hash(),
+            tx_hash: ee.block_hash(),
+        }
+    }
+}

aleph-client/src/pallets/aleph.rs

@@ -7,11 +7,10 @@ use crate::{
         pallet_aleph::pallet::Call::set_emergency_finalizer, primitives::app::Public,
         sp_core::ed25519::Public as EdPublic,
     },
-    connections::TxInfo,
     pallet_aleph::pallet::Call::schedule_finality_version_change,
     AccountId, AlephKeyPair, BlockHash,
     Call::Aleph,
-    ConnectionApi, Pair, RootConnection, SudoCall, TxStatus,
+    ConnectionApi, Pair, RootConnection, SudoCall, TxInfo, TxStatus,
 };
 
 // TODO replace docs with link to pallet aleph docs, once they are published

aleph-client/src/pallets/balances.rs

@@ -3,12 +3,11 @@ use subxt::{ext::sp_runtime::MultiAddress, tx::PolkadotExtrinsicParamsBuilder};
 
 use crate::{
     aleph_zero::{self, api, api::runtime_types::pallet_balances::BalanceLock},
-    connections::TxInfo,
     pallet_balances::pallet::Call::transfer,
     pallets::utility::UtilityApi,
     AccountId, BlockHash,
     Call::Balances,
-    ConnectionApi, SignedConnectionApi, TxStatus,
+    ConnectionApi, SignedConnectionApi, TxInfo, TxStatus,
 };
 
 /// Pallet balances read-only API.

aleph-client/src/pallets/contract.rs

@@ -4,8 +4,8 @@ use primitives::Balance;
 use subxt::{ext::sp_core::Bytes, rpc_params};
 
 use crate::{
-    api, connections::TxInfo, pallet_contracts::wasm::OwnerInfo, sp_weights::weight_v2::Weight,
-    AccountId, BlockHash, ConnectionApi, SignedConnectionApi, TxStatus,
+    api, pallet_contracts::wasm::OwnerInfo, sp_weights::weight_v2::Weight, AccountId, BlockHash,
+    ConnectionApi, SignedConnectionApi, TxInfo, TxStatus,
 };
 
 /// Arguments to [`ContractRpc::call_and_get`].

aleph-client/src/pallets/elections.rs

@@ -6,14 +6,14 @@ use crate::{
         pallet_elections::pallet::Call::set_ban_config,
         primitives::{BanReason, CommitteeSeats, EraValidators},
     },
-    connections::{AsConnection, TxInfo},
+    connections::AsConnection,
     pallet_elections::pallet::Call::{
         ban_from_committee, change_validators, set_elections_openness,
     },
     primitives::{BanConfig, BanInfo, ElectionOpenness},
     AccountId, BlockHash,
     Call::Elections,
-    ConnectionApi, RootConnection, SudoCall, TxStatus,
+    ConnectionApi, RootConnection, SudoCall, TxInfo, TxStatus,
 };
 
 // TODO once pallet elections docs are published, replace api docs with links to public docs

aleph-client/src/pallets/multisig.rs

@@ -7,9 +7,9 @@ use sp_core::blake2_256;
 use sp_runtime::traits::TrailingZeroInput;
 
 use crate::{
-    account_from_keypair, aleph_runtime::RuntimeCall, api, api::runtime_types, connections::TxInfo,
+    account_from_keypair, aleph_runtime::RuntimeCall, api, api::runtime_types,
     sp_weights::weight_v2::Weight, AccountId, BlockHash, ConnectionApi, SignedConnectionApi,
-    TxStatus,
+    TxInfo, TxStatus,
 };
 
 /// An alias for a call hash.

aleph-client/src/pallets/session.rs

@@ -1,8 +1,8 @@
 use primitives::SessionIndex;
 
 use crate::{
-    api, api::runtime_types::aleph_runtime::SessionKeys, connections::TxInfo, AccountId, BlockHash,
-    ConnectionApi, SignedConnectionApi, TxStatus,
+    api, api::runtime_types::aleph_runtime::SessionKeys, AccountId, BlockHash, ConnectionApi,
+    SignedConnectionApi, TxInfo, TxStatus,
 };
 
 /// Pallet session read-only api.

aleph-client/src/pallets/staking.rs

@@ -9,7 +9,7 @@ use subxt::{
 
 use crate::{
     api,
-    connections::{AsConnection, TxInfo},
+    connections::AsConnection,
     pallet_staking::{
         pallet::pallet::{
             Call::{bond, force_new_era, nominate, set_staking_configs},
@@ -23,7 +23,7 @@ use crate::{
     sp_arithmetic::per_things::Perbill,
     AccountId, BlockHash,
     Call::{Staking, Sudo},
-    ConnectionApi, RootConnection, SignedConnectionApi, SudoCall, TxStatus,
+    ConnectionApi, RootConnection, SignedConnectionApi, SudoCall, TxInfo, TxStatus,
 };
 
 /// Any object that implemnts pallet staking read-only api.

aleph-client/src/pallets/system.rs

@@ -3,12 +3,11 @@ use subxt::ext::sp_runtime::Perbill as SPerbill;
 
 use crate::{
     api,
-    connections::TxInfo,
     frame_system::pallet::Call::{fill_block, set_code},
     sp_arithmetic::per_things::Perbill,
     AccountId, BlockHash,
     Call::System,
-    ConnectionApi, RootConnection, SudoCall, TxStatus,
+    ConnectionApi, RootConnection, SudoCall, TxInfo, TxStatus,
 };
 
 /// Pallet system read-only api.