Revert "re-export crates used by subxt"

This reverts commit bd4174b.

aleph-client/src/lib.rs

@@ -16,14 +16,14 @@ use anyhow::anyhow;
 pub use contract_transcode;
 use serde::Serialize;
 use serde_json::value::RawValue;
-pub use subxt::ext::{codec, sp_core, sp_runtime};
-use subxt::{rpc::RpcParams, OnlineClient, PolkadotConfig, SubstrateConfig};
-
-pub use crate::sp_core::Pair;
-use crate::{
-    api::runtime_types::aleph_runtime::RuntimeCall as Call,
-    sp_core::{ed25519, sr25519, H256},
+pub use subxt::ext::sp_core::Pair;
+use subxt::{
+    ext::sp_core::{ed25519, sr25519, H256},
+    rpc::RpcParams,
+    OnlineClient, PolkadotConfig, SubstrateConfig,
 };
+
+use crate::api::runtime_types::aleph_runtime::RuntimeCall as Call;
 // generated by running `subxt codegen --derive Clone Debug Eq PartialEq | rustfmt --edition=2021 > src/aleph_zero.rs`
 #[allow(clippy::all)]
 mod aleph_zero;
@@ -45,7 +45,7 @@ pub type AlephKeyPair = ed25519::Pair;
 /// An alias for a type of a key pair that signs chain transactions.
 pub type RawKeyPair = sr25519::Pair;
 /// An alias for an account id type.
-pub type AccountId = crate::sp_core::crypto::AccountId32;
+pub type AccountId = subxt::ext::sp_core::crypto::AccountId32;
 /// An alias for a client type.
 pub type Client = OnlineClient<AlephConfig>;
 /// An alias for a hash type.

e2e-tests/src/test/ban.rs

@@ -1,13 +1,13 @@
 use std::collections::HashSet;
 
 use aleph_client::{
-    api::runtime_types::sp_core::bounded::bounded_vec::BoundedVec,
     pallets::{
         elections::{ElectionsApi, ElectionsSudoApi},
         session::SessionApi,
         staking::{StakingApi, StakingUserApi},
     },
     primitives::{BanInfo, BanReason, CommitteeSeats, ElectionOpenness},
+    sp_core::bounded::bounded_vec::BoundedVec,
     waiting::{BlockStatus, WaitingExt},
     SignedConnection, TxStatus,
 };

e2e-tests/src/test/staking.rs

@@ -1,7 +1,5 @@
 use aleph_client::{
-    account_from_keypair,
-    api::runtime_types::sp_core::bounded::bounded_vec::BoundedVec,
-    keypair_from_string,
+    account_from_keypair, keypair_from_string,
     pallet_staking::StakingLedger,
     pallets::{
         author::AuthorRpc,
@@ -11,6 +9,7 @@ use aleph_client::{
         staking::{StakingApi, StakingUserApi},
     },
     primitives::CommitteeSeats,
+    sp_core::bounded::bounded_vec::BoundedVec,
     waiting::{BlockStatus, WaitingExt},
     AccountId, KeyPair, Pair, SignedConnection, SignedConnectionApi, TxStatus,
 };