Use re-exports

aleph-client/src/connections.rs

@@ -4,16 +4,15 @@ use anyhow::anyhow;
 use codec::Decode;
 use log::info;
 use subxt::{
-    ext::sp_core::Bytes,
     metadata::DecodeWithMetadata,
     rpc::RpcParams,
     storage::{address::Yes, StaticStorageAddress, StorageAddress},
     tx::TxPayload,
 };
 
 use crate::{
-    api, sp_weights::weight_v2::Weight, AccountId, BlockHash, Call, KeyPair, ParamsBuilder,
-    SubxtClient, TxStatus,
+    api, sp_core::Bytes, sp_weights::weight_v2::Weight, AccountId, BlockHash, Call, KeyPair,
+    ParamsBuilder, SubxtClient, TxStatus,
 };
 
 #[derive(Clone)]

aleph-client/src/pallets/balances.rs

@@ -1,10 +1,10 @@
 use primitives::Balance;
-use subxt::ext::sp_runtime::MultiAddress;
 
 use crate::{
     aleph_zero::{self, api, api::runtime_types::pallet_balances::BalanceLock},
     pallet_balances::pallet::Call::transfer,
     pallets::utility::UtilityApi,
+    sp_runtime::MultiAddress,
     AccountId, BlockHash,
     Call::Balances,
     ConnectionApi, ParamsBuilder, SignedConnectionApi, TxStatus,

aleph-client/src/pallets/contract.rs

@@ -1,11 +1,11 @@
 use codec::{Compact, Encode};
 use pallet_contracts_primitives::ContractExecResult;
 use primitives::Balance;
-use subxt::{ext::sp_core::Bytes, rpc_params};
+use subxt::rpc_params;
 
 use crate::{
-    api, pallet_contracts::wasm::OwnerInfo, sp_weights::weight_v2::Weight, AccountId, BlockHash,
-    CodeHash, ConnectionApi, SignedConnectionApi, TxStatus,
+    api, pallet_contracts::wasm::OwnerInfo, sp_core::Bytes, sp_weights::weight_v2::Weight,
+    AccountId, BlockHash, CodeHash, ConnectionApi, SignedConnectionApi, TxStatus,
 };
 
 #[derive(Encode)]

aleph-client/src/pallets/staking.rs

@@ -1,11 +1,5 @@
 use primitives::{Balance, EraIndex};
-use subxt::{
-    ext::{
-        sp_core::storage::StorageKey,
-        sp_runtime::{MultiAddress, Perbill as SPerbill},
-    },
-    storage::address::{StorageHasher, StorageMapKey},
-};
+use subxt::storage::address::{StorageHasher, StorageMapKey};
 
 use crate::{
     api,
@@ -21,6 +15,8 @@ use crate::{
     pallet_sudo::pallet::Call::sudo_as,
     pallets::utility::UtilityApi,
     sp_arithmetic::per_things::Perbill,
+    sp_core::storage::StorageKey,
+    sp_runtime::{MultiAddress, Perbill as SPerbill},
     AccountId, BlockHash,
     Call::{Staking, Sudo},
     ConnectionApi, RootConnection, SignedConnectionApi, SudoCall, TxStatus,

aleph-client/src/pallets/system.rs

@@ -1,10 +1,10 @@
 use primitives::Balance;
-use subxt::ext::sp_runtime::Perbill as SPerbill;
 
 use crate::{
     api,
     frame_system::pallet::Call::{fill_block, set_code},
     sp_arithmetic::per_things::Perbill,
+    sp_runtime::Perbill as SPerbill,
     AccountId, BlockHash,
     Call::System,
     ConnectionApi, RootConnection, SudoCall, TxStatus,

aleph-client/src/pallets/treasury.rs

@@ -1,13 +1,13 @@
 use frame_support::PalletId;
 use primitives::{Balance, MILLISECS_PER_BLOCK};
 use sp_runtime::traits::AccountIdConversion;
-use subxt::ext::sp_runtime::MultiAddress;
 
 use crate::{
     api,
     connections::AsConnection,
     pallet_treasury::pallet::Call::{approve_proposal, reject_proposal},
     pallets::{elections::ElectionsApi, staking::StakingApi},
+    sp_runtime::MultiAddress,
     AccountId, BlockHash,
     Call::Treasury,
     ConnectionApi, RootConnection, SignedConnectionApi, SudoCall, TxStatus,

aleph-client/src/pallets/vesting.rs

@@ -1,8 +1,6 @@
-use subxt::ext::sp_runtime::MultiAddress;
-
 use crate::{
-    api, pallet_vesting::vesting_info::VestingInfo, AccountId, BlockHash, ConnectionApi,
-    SignedConnectionApi, TxStatus,
+    api, pallet_vesting::vesting_info::VestingInfo, sp_runtime::MultiAddress, AccountId, BlockHash,
+    ConnectionApi, SignedConnectionApi, TxStatus,
 };
 
 #[async_trait::async_trait]