From 8b1954956072efb2f0959139c17f779e6937dd64 Mon Sep 17 00:00:00 2001 From: James Wilson Date: Mon, 14 Mar 2022 15:39:40 +0000 Subject: [PATCH] Use RPC call to get account nonce (#476) * remove code related to getting nonce from storage and use RPC call instead * cargo fmt * move nonce fetching into Rpc, since it's just an RPC call * clippy --- codegen/src/api/calls.rs | 9 +- codegen/src/api/mod.rs | 105 +- codegen/src/api/storage.rs | 31 - subxt/src/client.rs | 36 +- subxt/src/config.rs | 30 +- subxt/src/lib.rs | 1 - subxt/src/rpc.rs | 11 + subxt/tests/integration/codegen/polkadot.rs | 1276 ++++++------------- subxt/tests/integration/frame/balances.rs | 42 + subxt/tests/integration/frame/contracts.rs | 5 +- 10 files changed, 460 insertions(+), 1086 deletions(-) diff --git a/codegen/src/api/calls.rs b/codegen/src/api/calls.rs index f8e086a877..4fc531f499 100644 --- a/codegen/src/api/calls.rs +++ b/codegen/src/api/calls.rs @@ -90,7 +90,7 @@ pub fn generate_calls( pub fn #fn_name( &self, #( #call_fn_args, )* - ) -> ::subxt::SubmittableExtrinsic<'a, T, X, A, #call_struct_name, DispatchError, root_mod::Event> { + ) -> ::subxt::SubmittableExtrinsic<'a, T, X, #call_struct_name, DispatchError, root_mod::Event> { let call = #call_struct_name { #( #call_args, )* }; ::subxt::SubmittableExtrinsic::new(self.client, call) } @@ -108,16 +108,15 @@ pub fn generate_calls( #( #call_structs )* - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { client, marker: ::core::marker::PhantomData } diff --git a/codegen/src/api/mod.rs b/codegen/src/api/mod.rs index 5b706443db..277983b6cd 100644 --- a/codegen/src/api/mod.rs +++ b/codegen/src/api/mod.rs @@ -49,10 +49,8 @@ use crate::{ use codec::Decode; use frame_metadata::{ v14::RuntimeMetadataV14, - PalletMetadata, RuntimeMetadata, RuntimeMetadataPrefixed, - StorageEntryType, }; use heck::ToSnakeCase as _; use proc_macro2::TokenStream as TokenStream2; @@ -61,7 +59,6 @@ use quote::{ format_ident, quote, }; -use scale_info::form::PortableForm; use std::{ collections::HashMap, fs, @@ -268,16 +265,6 @@ impl RuntimeGenerator { let has_module_error_impl = errors::generate_has_module_error_impl(&self.metadata, types_mod_ident); - let default_account_data_ident = format_ident!("DefaultAccountData"); - let default_account_data_impl = generate_default_account_data_impl( - &pallets_with_mod_names, - &default_account_data_ident, - &type_gen, - ); - let type_parameter_default_impl = default_account_data_impl - .as_ref() - .map(|_| quote!( = #default_account_data_ident )); - quote! { #[allow(dead_code, unused_imports, non_camel_case_types)] pub mod #mod_ident { @@ -293,29 +280,25 @@ impl RuntimeGenerator { // Impl HasModuleError on DispatchError so we can pluck out module error details. #has_module_error_impl - #default_account_data_impl - - pub struct RuntimeApi { + pub struct RuntimeApi { pub client: ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl ::core::convert::From<::subxt::Client> for RuntimeApi + impl ::core::convert::From<::subxt::Client> for RuntimeApi where T: ::subxt::Config, - X: ::subxt::SignedExtra, - A: ::subxt::AccountData, + X: ::subxt::SignedExtra { fn from(client: ::subxt::Client) -> Self { Self { client, marker: ::core::marker::PhantomData } } } - impl<'a, T, X, A> RuntimeApi + impl<'a, T, X> RuntimeApi where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn constants(&'a self) -> ConstantsApi { ConstantsApi @@ -325,7 +308,7 @@ impl RuntimeGenerator { StorageApi { client: &self.client } } - pub fn tx(&'a self) -> TransactionApi<'a, T, X, A> { + pub fn tx(&'a self) -> TransactionApi<'a, T, X> { TransactionApi { client: &self.client, marker: ::core::marker::PhantomData } } @@ -377,19 +360,18 @@ impl RuntimeGenerator { )* } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { #( - pub fn #pallets_with_calls(&self) -> #pallets_with_calls::calls::TransactionApi<'a, T, X, A> { + pub fn #pallets_with_calls(&self) -> #pallets_with_calls::calls::TransactionApi<'a, T, X> { #pallets_with_calls::calls::TransactionApi::new(self.client) } )* @@ -399,73 +381,6 @@ impl RuntimeGenerator { } } -/// Most chains require a valid account nonce as part of the extrinsic, so the default behaviour of -/// the client is to fetch the nonce for the current account. -/// -/// The account index (aka nonce) is commonly stored in the `System` pallet's `Account` storage item. -/// This function attempts to find that storage item, and if it is present will implement the -/// `subxt::AccountData` trait for it. This allows the client to construct the appropriate -/// storage key from the account id, and then retrieve the `nonce` from the resulting storage item. -fn generate_default_account_data_impl( - pallets_with_mod_names: &[(&PalletMetadata, syn::Ident)], - default_impl_name: &syn::Ident, - type_gen: &TypeGenerator, -) -> Option { - let storage = pallets_with_mod_names - .iter() - .find(|(pallet, _)| pallet.name == "System") - .and_then(|(pallet, _)| pallet.storage.as_ref())?; - let storage_entry = storage - .entries - .iter() - .find(|entry| entry.name == "Account")?; - - // resolve the concrete types for `AccountId` (to build the key) and `Index` to extract the - // account index (nonce) value from the result. - let (account_id_ty, account_nonce_ty) = - if let StorageEntryType::Map { key, value, .. } = &storage_entry.ty { - let account_id_ty = type_gen.resolve_type_path(key.id(), &[]); - let account_data_ty = type_gen.resolve_type(value.id()); - let nonce_field = if let scale_info::TypeDef::Composite(composite) = - account_data_ty.type_def() - { - composite - .fields() - .iter() - .find(|f| f.name() == Some(&"nonce".to_string()))? - } else { - abort_call_site!("Expected a `nonce` field in the account info struct") - }; - let account_nonce_ty = type_gen.resolve_type_path(nonce_field.ty().id(), &[]); - (account_id_ty, account_nonce_ty) - } else { - abort_call_site!("System::Account should be a `StorageEntryType::Map`") - }; - - // this path to the storage entry depends on storage codegen. - // AccountOwned contains the same data as Account does, but without references. - let storage_entry_path = quote!(self::system::storage::AccountOwned); - - Some(quote! { - /// The default storage entry from which to fetch an account nonce, required for - /// constructing a transaction. - pub enum #default_impl_name {} - - impl ::subxt::AccountData for #default_impl_name { - type StorageEntry = #storage_entry_path; - type AccountId = #account_id_ty; - type Index = #account_nonce_ty; - - fn storage_entry(account_id: Self::AccountId) -> Self::StorageEntry { - #storage_entry_path(account_id) - } - fn nonce(result: &::Value) -> Self::Index { - result.nonce - } - } - }) -} - pub fn generate_structs_from_variants<'a, F>( type_gen: &'a TypeGenerator, type_id: u32, diff --git a/codegen/src/api/storage.rs b/codegen/src/api/storage.rs index dd2a52ade0..6947a65998 100644 --- a/codegen/src/api/storage.rs +++ b/codegen/src/api/storage.rs @@ -74,8 +74,6 @@ fn generate_storage_entry_fns( storage_entry: &StorageEntryMetadata, ) -> (TokenStream2, TokenStream2) { let entry_struct_ident = format_ident!("{}", storage_entry.name); - let is_account_wrapper = pallet.name == "System" && storage_entry.name == "Account"; - let wrapper_struct_ident = format_ident!("{}Owned", storage_entry.name); let (fields, entry_struct, constructor, key_impl, should_ref) = match storage_entry.ty { StorageEntryType::Plain(_) => { @@ -183,18 +181,6 @@ fn generate_storage_entry_fns( let ty_path = type_gen.resolve_type_path(key.id(), &[]); let fields = vec![(format_ident!("_0"), ty_path.clone())]; - // `::system::storage::Account` was utilized as associated type `StorageEntry` - // for `::subxt::AccountData` implementation by the generated `DefaultAccountData`. - // Due to changes in the storage API, `::system::storage::Account` cannot be - // used without specifying a lifetime. To satisfy `::subxt::AccountData` - // implementation, a non-reference wrapper `AccountOwned` is generated. - let wrapper_struct = if is_account_wrapper { - quote!( - pub struct #wrapper_struct_ident ( pub #ty_path ); - ) - } else { - quote!() - }; // `ty_path` can be `std::vec::Vec`. In such cases, the entry struct // should contain a slice reference. @@ -204,7 +190,6 @@ fn generate_storage_entry_fns( }; let entry_struct = quote! { pub struct #entry_struct_ident #lifetime_param( pub #lifetime_ref #ty_slice ); - #wrapper_struct }; let constructor = quote!( #entry_struct_ident(_0) ); let hasher = hashers.get(0).unwrap_or_else(|| { @@ -256,27 +241,11 @@ fn generate_storage_entry_fns( } ); - // The wrapper account must implement the same trait as the counter-part Account, - // with the same pallet and storage. This continues the implementation of the wrapper - // generated with the Account. - let wrapper_entry_impl = if is_account_wrapper { - quote!( - impl ::subxt::StorageEntry for #wrapper_struct_ident { - #storage_entry_impl - } - ) - } else { - quote!() - }; - let storage_entry_type = quote! { #entry_struct - impl ::subxt::StorageEntry for #entry_struct_ident #anon_lifetime { #storage_entry_impl } - - #wrapper_entry_impl }; let client_iter_fn = if matches!(storage_entry.ty, StorageEntryType::Map { .. }) { diff --git a/subxt/src/client.rs b/subxt/src/client.rs index 35781c46d7..9d1f710438 100644 --- a/subxt/src/client.rs +++ b/subxt/src/client.rs @@ -37,7 +37,6 @@ use crate::{ }, storage::StorageClient, transaction::TransactionProgress, - AccountData, Call, Config, Metadata, @@ -170,23 +169,6 @@ impl Client { StorageClient::new(&self.rpc, &self.metadata, self.iter_page_size) } - /// Fetch the current nonce for the given account id. - pub async fn fetch_nonce( - &self, - account: &T::AccountId, - ) -> Result - where - ::AccountId: From<::AccountId>, - ::Index: Into<::Index>, - { - let account_storage_entry = A::storage_entry(account.clone().into()); - let account_data = self - .storage() - .fetch_or_default(&account_storage_entry, None) - .await?; - Ok(A::nonce(&account_data).into()) - } - /// Convert the client to a runtime api wrapper for custom runtime access. /// /// The `subxt` proc macro will provide methods to submit extrinsics and read storage specific @@ -197,17 +179,16 @@ impl Client { } /// A constructed call ready to be signed and submitted. -pub struct SubmittableExtrinsic<'client, T: Config, X, A, C, E: Decode, Evs: Decode> { +pub struct SubmittableExtrinsic<'client, T: Config, X, C, E: Decode, Evs: Decode> { client: &'client Client, call: C, - marker: std::marker::PhantomData<(X, A, E, Evs)>, + marker: std::marker::PhantomData<(X, E, Evs)>, } -impl<'client, T, X, A, C, E, Evs> SubmittableExtrinsic<'client, T, X, A, C, E, Evs> +impl<'client, T, X, C, E, Evs> SubmittableExtrinsic<'client, T, X, C, E, Evs> where T: Config, X: SignedExtra, - A: AccountData, C: Call + Send + Sync, E: Decode + HasModuleError, Evs: Decode, @@ -232,8 +213,6 @@ where where <>::Extra as SignedExtension>::AdditionalSigned: Send + Sync + 'static, - ::AccountId: From<::AccountId>, - ::Index: Into<::Index>, { // Sign the call data to create our extrinsic. let extrinsic = self.create_signed(signer, Default::default()).await?; @@ -262,8 +241,6 @@ where where <>::Extra as SignedExtension>::AdditionalSigned: Send + Sync + 'static, - ::AccountId: From<::AccountId>, - ::Index: Into<::Index>, { let extrinsic = self.create_signed(signer, Default::default()).await?; self.client.rpc().submit_extrinsic(extrinsic).await @@ -278,13 +255,14 @@ where where <>::Extra as SignedExtension>::AdditionalSigned: Send + Sync + 'static, - ::AccountId: From<::AccountId>, - ::Index: Into<::Index>, { let account_nonce = if let Some(nonce) = signer.nonce() { nonce } else { - self.client.fetch_nonce::(signer.account_id()).await? + self.client + .rpc() + .system_account_next_index(signer.account_id()) + .await? }; let call = self .client diff --git a/subxt/src/config.rs b/subxt/src/config.rs index 09c363c2ac..0069a747d7 100644 --- a/subxt/src/config.rs +++ b/subxt/src/config.rs @@ -14,7 +14,6 @@ // You should have received a copy of the GNU General Public License // along with subxt. If not, see . -use crate::StorageEntry; use codec::{ Codec, Encode, @@ -38,7 +37,13 @@ use sp_runtime::traits::{ pub trait Config: 'static { /// Account index (aka nonce) type. This stores the number of previous /// transactions associated with a sender account. - type Index: Parameter + Member + Default + AtLeast32Bit + Copy + scale_info::TypeInfo; + type Index: Parameter + + Member + + serde::de::DeserializeOwned + + Default + + AtLeast32Bit + + Copy + + scale_info::TypeInfo; /// The block number type used by the runtime. type BlockNumber: Parameter @@ -65,7 +70,7 @@ pub trait Config: 'static { type Hashing: Hash; /// The user account identifier type for the runtime. - type AccountId: Parameter + Member; + type AccountId: Parameter + Member + serde::Serialize; /// The address type. This instead of `::Source`. type Address: Codec + Clone + PartialEq; @@ -103,22 +108,3 @@ impl Config for DefaultConfig { type Signature = sp_runtime::MultiSignature; type Extrinsic = sp_runtime::OpaqueExtrinsic; } - -/// Trait to fetch data about an account. -pub trait AccountData { - /// The runtime storage entry from which the account data can be fetched. - /// Usually generated by the `subxt` macro. - type StorageEntry: StorageEntry; - - /// The type of the account id to fetch the account data for. - type AccountId; - - /// The type of the account nonce returned from storage. - type Index; - - /// Create a new storage entry key from the account id. - fn storage_entry(account_id: Self::AccountId) -> Self::StorageEntry; - - /// Get the nonce from the storage entry value. - fn nonce(result: &::Value) -> Self::Index; -} diff --git a/subxt/src/lib.rs b/subxt/src/lib.rs index f7620a710c..dc4e1e2723 100644 --- a/subxt/src/lib.rs +++ b/subxt/src/lib.rs @@ -73,7 +73,6 @@ pub use crate::{ SubmittableExtrinsic, }, config::{ - AccountData, Config, DefaultConfig, }, diff --git a/subxt/src/rpc.rs b/subxt/src/rpc.rs index 5f062aca4e..7256c08b64 100644 --- a/subxt/src/rpc.rs +++ b/subxt/src/rpc.rs @@ -324,6 +324,17 @@ impl Rpc { Ok(self.client.request("system_version", rpc_params![]).await?) } + /// Fetch the current nonce for the given account ID. + pub async fn system_account_next_index( + &self, + account: &T::AccountId, + ) -> Result { + Ok(self + .client + .request("system_accountNextIndex", rpc_params![account]) + .await?) + } + /// Get a header pub async fn header( &self, diff --git a/subxt/tests/integration/codegen/polkadot.rs b/subxt/tests/integration/codegen/polkadot.rs index e158b897e7..eca60c0583 100644 --- a/subxt/tests/integration/codegen/polkadot.rs +++ b/subxt/tests/integration/codegen/polkadot.rs @@ -1,3 +1,4 @@ +// Note [jsdw]: generated from polkadot 0.9.13-82616422d0-aarch64-macos #[allow(dead_code, unused_imports, non_camel_case_types)] pub mod api { use super::api as root_mod; @@ -75,15 +76,11 @@ pub mod api { XcmPallet(xcm_pallet::Event), } pub mod system { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct FillBlock { @@ -166,15 +163,14 @@ pub mod api { const PALLET: &'static str = "System"; const FUNCTION: &'static str = "remark_with_event"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -189,7 +185,6 @@ pub mod api { 'a, T, X, - A, FillBlock, DispatchError, root_mod::Event, @@ -204,7 +199,6 @@ pub mod api { 'a, T, X, - A, Remark, DispatchError, root_mod::Event, @@ -219,7 +213,6 @@ pub mod api { 'a, T, X, - A, SetHeapPages, DispatchError, root_mod::Event, @@ -234,7 +227,6 @@ pub mod api { 'a, T, X, - A, SetCode, DispatchError, root_mod::Event, @@ -249,7 +241,6 @@ pub mod api { 'a, T, X, - A, SetCodeWithoutChecks, DispatchError, root_mod::Event, @@ -267,7 +258,6 @@ pub mod api { 'a, T, X, - A, SetStorage, DispatchError, root_mod::Event, @@ -282,7 +272,6 @@ pub mod api { 'a, T, X, - A, KillStorage, DispatchError, root_mod::Event, @@ -298,7 +287,6 @@ pub mod api { 'a, T, X, - A, KillPrefix, DispatchError, root_mod::Event, @@ -313,7 +301,6 @@ pub mod api { 'a, T, X, - A, RemarkWithEvent, DispatchError, root_mod::Event, @@ -378,7 +365,6 @@ pub mod api { pub mod storage { use super::runtime_types; pub struct Account<'a>(pub &'a ::subxt::sp_core::crypto::AccountId32); - pub struct AccountOwned(pub ::subxt::sp_core::crypto::AccountId32); impl ::subxt::StorageEntry for Account<'_> { const PALLET: &'static str = "System"; const STORAGE: &'static str = "Account"; @@ -393,20 +379,6 @@ pub mod api { )]) } } - impl ::subxt::StorageEntry for AccountOwned { - const PALLET: &'static str = "System"; - const STORAGE: &'static str = "Account"; - type Value = runtime_types::frame_system::AccountInfo< - ::core::primitive::u32, - runtime_types::pallet_balances::AccountData<::core::primitive::u128>, - >; - fn key(&self) -> ::subxt::StorageEntryKey { - ::subxt::StorageEntryKey::Map(vec![::subxt::StorageMapKey::new( - &self.0, - ::subxt::StorageHasher::Blake2_128Concat, - )]) - } - } pub struct ExtrinsicCount; impl ::subxt::StorageEntry for ExtrinsicCount { const PALLET: &'static str = "System"; @@ -871,15 +843,11 @@ pub mod api { } } pub mod scheduler { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Schedule { @@ -976,15 +944,14 @@ pub mod api { const PALLET: &'static str = "Scheduler"; const FUNCTION: &'static str = "schedule_named_after"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -1008,7 +975,6 @@ pub mod api { 'a, T, X, - A, Schedule, DispatchError, root_mod::Event, @@ -1029,7 +995,6 @@ pub mod api { 'a, T, X, - A, Cancel, DispatchError, root_mod::Event, @@ -1054,7 +1019,6 @@ pub mod api { 'a, T, X, - A, ScheduleNamed, DispatchError, root_mod::Event, @@ -1075,7 +1039,6 @@ pub mod api { 'a, T, X, - A, CancelNamed, DispatchError, root_mod::Event, @@ -1099,7 +1062,6 @@ pub mod api { 'a, T, X, - A, ScheduleAfter, DispatchError, root_mod::Event, @@ -1129,7 +1091,6 @@ pub mod api { 'a, T, X, - A, ScheduleNamedAfter, DispatchError, root_mod::Event, @@ -1313,15 +1274,11 @@ pub mod api { } } pub mod preimage { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct NotePreimage { @@ -1355,15 +1312,14 @@ pub mod api { const PALLET: &'static str = "Preimage"; const FUNCTION: &'static str = "unrequest_preimage"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -1378,7 +1334,6 @@ pub mod api { 'a, T, X, - A, NotePreimage, DispatchError, root_mod::Event, @@ -1393,7 +1348,6 @@ pub mod api { 'a, T, X, - A, UnnotePreimage, DispatchError, root_mod::Event, @@ -1408,7 +1362,6 @@ pub mod api { 'a, T, X, - A, RequestPreimage, DispatchError, root_mod::Event, @@ -1423,7 +1376,6 @@ pub mod api { 'a, T, X, - A, UnrequestPreimage, DispatchError, root_mod::Event, @@ -1553,15 +1505,11 @@ pub mod api { } } pub mod babe { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct ReportEquivocation { @@ -1606,15 +1554,14 @@ pub mod api { const PALLET: &'static str = "Babe"; const FUNCTION: &'static str = "plan_config_change"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -1630,7 +1577,6 @@ pub mod api { 'a, T, X, - A, ReportEquivocation, DispatchError, root_mod::Event, @@ -1649,7 +1595,6 @@ pub mod api { 'a, T, X, - A, ReportEquivocationUnsigned, DispatchError, root_mod::Event, @@ -1667,7 +1612,6 @@ pub mod api { 'a, T, X, - A, PlanConfigChange, DispatchError, root_mod::Event, @@ -2031,15 +1975,11 @@ pub mod api { } } pub mod timestamp { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Set { @@ -2050,15 +1990,14 @@ pub mod api { const PALLET: &'static str = "Timestamp"; const FUNCTION: &'static str = "set"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -2073,7 +2012,6 @@ pub mod api { 'a, T, X, - A, Set, DispatchError, root_mod::Event, @@ -2144,15 +2082,11 @@ pub mod api { } } pub mod indices { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive( :: subxt :: codec :: Encode, @@ -2212,15 +2146,14 @@ pub mod api { const PALLET: &'static str = "Indices"; const FUNCTION: &'static str = "freeze"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -2235,7 +2168,6 @@ pub mod api { 'a, T, X, - A, Claim, DispatchError, root_mod::Event, @@ -2251,7 +2183,6 @@ pub mod api { 'a, T, X, - A, Transfer, DispatchError, root_mod::Event, @@ -2266,7 +2197,6 @@ pub mod api { 'a, T, X, - A, Free, DispatchError, root_mod::Event, @@ -2283,7 +2213,6 @@ pub mod api { 'a, T, X, - A, ForceTransfer, DispatchError, root_mod::Event, @@ -2298,7 +2227,6 @@ pub mod api { 'a, T, X, - A, Freeze, DispatchError, root_mod::Event, @@ -2413,15 +2341,11 @@ pub mod api { } } pub mod balances { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Transfer { @@ -2505,15 +2429,14 @@ pub mod api { const PALLET: &'static str = "Balances"; const FUNCTION: &'static str = "force_unreserve"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -2532,7 +2455,6 @@ pub mod api { 'a, T, X, - A, Transfer, DispatchError, root_mod::Event, @@ -2552,7 +2474,6 @@ pub mod api { 'a, T, X, - A, SetBalance, DispatchError, root_mod::Event, @@ -2579,7 +2500,6 @@ pub mod api { 'a, T, X, - A, ForceTransfer, DispatchError, root_mod::Event, @@ -2602,7 +2522,6 @@ pub mod api { 'a, T, X, - A, TransferKeepAlive, DispatchError, root_mod::Event, @@ -2621,7 +2540,6 @@ pub mod api { 'a, T, X, - A, TransferAll, DispatchError, root_mod::Event, @@ -2640,7 +2558,6 @@ pub mod api { 'a, T, X, - A, ForceUnreserve, DispatchError, root_mod::Event, @@ -2931,10 +2848,8 @@ pub mod api { } } pub mod transaction_payment { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod storage { use super::runtime_types; pub struct NextFeeMultiplier; @@ -3026,15 +2941,11 @@ pub mod api { } } pub mod authorship { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct SetUncles { @@ -3049,15 +2960,14 @@ pub mod api { const PALLET: &'static str = "Authorship"; const FUNCTION: &'static str = "set_uncles"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -3077,7 +2987,6 @@ pub mod api { 'a, T, X, - A, SetUncles, DispatchError, root_mod::Event, @@ -3181,15 +3090,11 @@ pub mod api { } } pub mod staking { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Bond { @@ -3430,15 +3335,14 @@ pub mod api { const PALLET: &'static str = "Staking"; const FUNCTION: &'static str = "chill_other"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -3460,7 +3364,6 @@ pub mod api { 'a, T, X, - A, Bond, DispatchError, root_mod::Event, @@ -3479,7 +3382,6 @@ pub mod api { 'a, T, X, - A, BondExtra, DispatchError, root_mod::Event, @@ -3494,7 +3396,6 @@ pub mod api { 'a, T, X, - A, Unbond, DispatchError, root_mod::Event, @@ -3509,7 +3410,6 @@ pub mod api { 'a, T, X, - A, WithdrawUnbonded, DispatchError, root_mod::Event, @@ -3524,7 +3424,6 @@ pub mod api { 'a, T, X, - A, Validate, DispatchError, root_mod::Event, @@ -3544,7 +3443,6 @@ pub mod api { 'a, T, X, - A, Nominate, DispatchError, root_mod::Event, @@ -3558,7 +3456,6 @@ pub mod api { 'a, T, X, - A, Chill, DispatchError, root_mod::Event, @@ -3575,7 +3472,6 @@ pub mod api { 'a, T, X, - A, SetPayee, DispatchError, root_mod::Event, @@ -3593,7 +3489,6 @@ pub mod api { 'a, T, X, - A, SetController, DispatchError, root_mod::Event, @@ -3608,7 +3503,6 @@ pub mod api { 'a, T, X, - A, SetValidatorCount, DispatchError, root_mod::Event, @@ -3623,7 +3517,6 @@ pub mod api { 'a, T, X, - A, IncreaseValidatorCount, DispatchError, root_mod::Event, @@ -3638,7 +3531,6 @@ pub mod api { 'a, T, X, - A, ScaleValidatorCount, DispatchError, root_mod::Event, @@ -3652,7 +3544,6 @@ pub mod api { 'a, T, X, - A, ForceNoEras, DispatchError, root_mod::Event, @@ -3666,7 +3557,6 @@ pub mod api { 'a, T, X, - A, ForceNewEra, DispatchError, root_mod::Event, @@ -3681,7 +3571,6 @@ pub mod api { 'a, T, X, - A, SetInvulnerables, DispatchError, root_mod::Event, @@ -3697,7 +3586,6 @@ pub mod api { 'a, T, X, - A, ForceUnstake, DispatchError, root_mod::Event, @@ -3714,7 +3602,6 @@ pub mod api { 'a, T, X, - A, ForceNewEraAlways, DispatchError, root_mod::Event, @@ -3730,7 +3617,6 @@ pub mod api { 'a, T, X, - A, CancelDeferredSlash, DispatchError, root_mod::Event, @@ -3746,7 +3632,6 @@ pub mod api { 'a, T, X, - A, PayoutStakers, DispatchError, root_mod::Event, @@ -3764,7 +3649,6 @@ pub mod api { 'a, T, X, - A, Rebond, DispatchError, root_mod::Event, @@ -3780,7 +3664,6 @@ pub mod api { 'a, T, X, - A, SetHistoryDepth, DispatchError, root_mod::Event, @@ -3799,7 +3682,6 @@ pub mod api { 'a, T, X, - A, ReapStash, DispatchError, root_mod::Event, @@ -3822,7 +3704,6 @@ pub mod api { 'a, T, X, - A, Kick, DispatchError, root_mod::Event, @@ -3844,7 +3725,6 @@ pub mod api { 'a, T, X, - A, SetStakingConfigs, DispatchError, root_mod::Event, @@ -3866,7 +3746,6 @@ pub mod api { 'a, T, X, - A, ChillOther, DispatchError, root_mod::Event, @@ -5097,10 +4976,8 @@ pub mod api { } } pub mod offences { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub type Event = runtime_types::pallet_offences::pallet::Event; pub mod events { use super::runtime_types; @@ -5253,21 +5130,15 @@ pub mod api { } } pub mod historical { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; } pub mod session { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct SetKeys { @@ -5284,15 +5155,14 @@ pub mod api { const PALLET: &'static str = "Session"; const FUNCTION: &'static str = "purge_keys"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -5308,7 +5178,6 @@ pub mod api { 'a, T, X, - A, SetKeys, DispatchError, root_mod::Event, @@ -5322,7 +5191,6 @@ pub mod api { 'a, T, X, - A, PurgeKeys, DispatchError, root_mod::Event, @@ -5527,15 +5395,11 @@ pub mod api { } } pub mod grandpa { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct ReportEquivocation { @@ -5574,15 +5438,14 @@ pub mod api { const PALLET: &'static str = "Grandpa"; const FUNCTION: &'static str = "note_stalled"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -5598,7 +5461,6 @@ pub mod api { 'a, T, X, - A, ReportEquivocation, DispatchError, root_mod::Event, @@ -5617,7 +5479,6 @@ pub mod api { 'a, T, X, - A, ReportEquivocationUnsigned, DispatchError, root_mod::Event, @@ -5636,7 +5497,6 @@ pub mod api { 'a, T, X, - A, NoteStalled, DispatchError, root_mod::Event, @@ -5838,15 +5698,11 @@ pub mod api { } } pub mod im_online { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Heartbeat { @@ -5859,15 +5715,14 @@ pub mod api { const PALLET: &'static str = "ImOnline"; const FUNCTION: &'static str = "heartbeat"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -5885,7 +5740,6 @@ pub mod api { 'a, T, X, - A, Heartbeat, DispatchError, root_mod::Event, @@ -6075,21 +5929,15 @@ pub mod api { } } pub mod authority_discovery { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; } pub mod democracy { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Propose { @@ -6322,15 +6170,14 @@ pub mod api { const PALLET: &'static str = "Democracy"; const FUNCTION: &'static str = "cancel_proposal"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -6346,7 +6193,6 @@ pub mod api { 'a, T, X, - A, Propose, DispatchError, root_mod::Event, @@ -6365,7 +6211,6 @@ pub mod api { 'a, T, X, - A, Second, DispatchError, root_mod::Event, @@ -6386,7 +6231,6 @@ pub mod api { 'a, T, X, - A, Vote, DispatchError, root_mod::Event, @@ -6401,7 +6245,6 @@ pub mod api { 'a, T, X, - A, EmergencyCancel, DispatchError, root_mod::Event, @@ -6416,7 +6259,6 @@ pub mod api { 'a, T, X, - A, ExternalPropose, DispatchError, root_mod::Event, @@ -6431,7 +6273,6 @@ pub mod api { 'a, T, X, - A, ExternalProposeMajority, DispatchError, root_mod::Event, @@ -6446,7 +6287,6 @@ pub mod api { 'a, T, X, - A, ExternalProposeDefault, DispatchError, root_mod::Event, @@ -6463,7 +6303,6 @@ pub mod api { 'a, T, X, - A, FastTrack, DispatchError, root_mod::Event, @@ -6482,7 +6321,6 @@ pub mod api { 'a, T, X, - A, VetoExternal, DispatchError, root_mod::Event, @@ -6497,7 +6335,6 @@ pub mod api { 'a, T, X, - A, CancelReferendum, DispatchError, root_mod::Event, @@ -6512,7 +6349,6 @@ pub mod api { 'a, T, X, - A, CancelQueued, DispatchError, root_mod::Event, @@ -6529,7 +6365,6 @@ pub mod api { 'a, T, X, - A, Delegate, DispatchError, root_mod::Event, @@ -6547,7 +6382,6 @@ pub mod api { 'a, T, X, - A, Undelegate, DispatchError, root_mod::Event, @@ -6561,7 +6395,6 @@ pub mod api { 'a, T, X, - A, ClearPublicProposals, DispatchError, root_mod::Event, @@ -6576,7 +6409,6 @@ pub mod api { 'a, T, X, - A, NotePreimage, DispatchError, root_mod::Event, @@ -6591,7 +6423,6 @@ pub mod api { 'a, T, X, - A, NotePreimageOperational, DispatchError, root_mod::Event, @@ -6606,7 +6437,6 @@ pub mod api { 'a, T, X, - A, NoteImminentPreimage, DispatchError, root_mod::Event, @@ -6621,7 +6451,6 @@ pub mod api { 'a, T, X, - A, NoteImminentPreimageOperational, DispatchError, root_mod::Event, @@ -6637,7 +6466,6 @@ pub mod api { 'a, T, X, - A, ReapPreimage, DispatchError, root_mod::Event, @@ -6655,7 +6483,6 @@ pub mod api { 'a, T, X, - A, Unlock, DispatchError, root_mod::Event, @@ -6670,7 +6497,6 @@ pub mod api { 'a, T, X, - A, RemoveVote, DispatchError, root_mod::Event, @@ -6686,7 +6512,6 @@ pub mod api { 'a, T, X, - A, RemoveOtherVote, DispatchError, root_mod::Event, @@ -6702,7 +6527,6 @@ pub mod api { 'a, T, X, - A, EnactProposal, DispatchError, root_mod::Event, @@ -6721,7 +6545,6 @@ pub mod api { 'a, T, X, - A, Blacklist, DispatchError, root_mod::Event, @@ -6739,7 +6562,6 @@ pub mod api { 'a, T, X, - A, CancelProposal, DispatchError, root_mod::Event, @@ -7454,15 +7276,11 @@ pub mod api { } } pub mod council { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct SetMembers { @@ -7529,15 +7347,14 @@ pub mod api { const PALLET: &'static str = "Council"; const FUNCTION: &'static str = "disapprove_proposal"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -7554,7 +7371,6 @@ pub mod api { 'a, T, X, - A, SetMembers, DispatchError, root_mod::Event, @@ -7574,7 +7390,6 @@ pub mod api { 'a, T, X, - A, Execute, DispatchError, root_mod::Event, @@ -7594,7 +7409,6 @@ pub mod api { 'a, T, X, - A, Propose, DispatchError, root_mod::Event, @@ -7615,7 +7429,6 @@ pub mod api { 'a, T, X, - A, Vote, DispatchError, root_mod::Event, @@ -7637,7 +7450,6 @@ pub mod api { 'a, T, X, - A, Close, DispatchError, root_mod::Event, @@ -7657,7 +7469,6 @@ pub mod api { 'a, T, X, - A, DisapproveProposal, DispatchError, root_mod::Event, @@ -7904,15 +7715,11 @@ pub mod api { } } pub mod technical_committee { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct SetMembers { @@ -7979,15 +7786,14 @@ pub mod api { const PALLET: &'static str = "TechnicalCommittee"; const FUNCTION: &'static str = "disapprove_proposal"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -8004,7 +7810,6 @@ pub mod api { 'a, T, X, - A, SetMembers, DispatchError, root_mod::Event, @@ -8024,7 +7829,6 @@ pub mod api { 'a, T, X, - A, Execute, DispatchError, root_mod::Event, @@ -8044,7 +7848,6 @@ pub mod api { 'a, T, X, - A, Propose, DispatchError, root_mod::Event, @@ -8065,7 +7868,6 @@ pub mod api { 'a, T, X, - A, Vote, DispatchError, root_mod::Event, @@ -8087,7 +7889,6 @@ pub mod api { 'a, T, X, - A, Close, DispatchError, root_mod::Event, @@ -8107,7 +7908,6 @@ pub mod api { 'a, T, X, - A, DisapproveProposal, DispatchError, root_mod::Event, @@ -8354,15 +8154,11 @@ pub mod api { } } pub mod phragmen_election { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Vote { @@ -8418,15 +8214,14 @@ pub mod api { const PALLET: &'static str = "PhragmenElection"; const FUNCTION: &'static str = "clean_defunct_voters"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -8442,7 +8237,6 @@ pub mod api { 'a, T, X, - A, Vote, DispatchError, root_mod::Event, @@ -8456,7 +8250,6 @@ pub mod api { 'a, T, X, - A, RemoveVoter, DispatchError, root_mod::Event, @@ -8471,7 +8264,6 @@ pub mod api { 'a, T, X, - A, SubmitCandidacy, DispatchError, root_mod::Event, @@ -8486,7 +8278,6 @@ pub mod api { 'a, T, X, - A, RenounceCandidacy, DispatchError, root_mod::Event, @@ -8505,7 +8296,6 @@ pub mod api { 'a, T, X, - A, RemoveMember, DispatchError, root_mod::Event, @@ -8524,7 +8314,6 @@ pub mod api { 'a, T, X, - A, CleanDefunctVoters, DispatchError, root_mod::Event, @@ -8822,15 +8611,11 @@ pub mod api { } } pub mod technical_membership { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct AddMember { @@ -8887,15 +8672,14 @@ pub mod api { const PALLET: &'static str = "TechnicalMembership"; const FUNCTION: &'static str = "clear_prime"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -8910,7 +8694,6 @@ pub mod api { 'a, T, X, - A, AddMember, DispatchError, root_mod::Event, @@ -8925,7 +8708,6 @@ pub mod api { 'a, T, X, - A, RemoveMember, DispatchError, root_mod::Event, @@ -8941,7 +8723,6 @@ pub mod api { 'a, T, X, - A, SwapMember, DispatchError, root_mod::Event, @@ -8956,7 +8737,6 @@ pub mod api { 'a, T, X, - A, ResetMembers, DispatchError, root_mod::Event, @@ -8971,7 +8751,6 @@ pub mod api { 'a, T, X, - A, ChangeKey, DispatchError, root_mod::Event, @@ -8986,7 +8765,6 @@ pub mod api { 'a, T, X, - A, SetPrime, DispatchError, root_mod::Event, @@ -9000,7 +8778,6 @@ pub mod api { 'a, T, X, - A, ClearPrime, DispatchError, root_mod::Event, @@ -9101,15 +8878,11 @@ pub mod api { } } pub mod treasury { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct ProposeSpend { @@ -9142,15 +8915,14 @@ pub mod api { const PALLET: &'static str = "Treasury"; const FUNCTION: &'static str = "approve_proposal"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -9169,7 +8941,6 @@ pub mod api { 'a, T, X, - A, ProposeSpend, DispatchError, root_mod::Event, @@ -9184,7 +8955,6 @@ pub mod api { 'a, T, X, - A, RejectProposal, DispatchError, root_mod::Event, @@ -9199,7 +8969,6 @@ pub mod api { 'a, T, X, - A, ApproveProposal, DispatchError, root_mod::Event, @@ -9467,15 +9236,11 @@ pub mod api { } } pub mod claims { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Claim { @@ -9534,15 +9299,14 @@ pub mod api { const PALLET: &'static str = "Claims"; const FUNCTION: &'static str = "move_claim"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -9558,7 +9322,6 @@ pub mod api { 'a, T, X, - A, Claim, DispatchError, root_mod::Event, @@ -9585,7 +9348,6 @@ pub mod api { 'a, T, X, - A, MintClaim, DispatchError, root_mod::Event, @@ -9607,7 +9369,6 @@ pub mod api { 'a, T, X, - A, ClaimAttest, DispatchError, root_mod::Event, @@ -9626,7 +9387,6 @@ pub mod api { 'a, T, X, - A, Attest, DispatchError, root_mod::Event, @@ -9645,7 +9405,6 @@ pub mod api { 'a, T, X, - A, MoveClaim, DispatchError, root_mod::Event, @@ -9872,15 +9631,11 @@ pub mod api { } } pub mod vesting { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Vest; @@ -9942,15 +9697,14 @@ pub mod api { const PALLET: &'static str = "Vesting"; const FUNCTION: &'static str = "merge_schedules"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -9964,7 +9718,6 @@ pub mod api { 'a, T, X, - A, Vest, DispatchError, root_mod::Event, @@ -9982,7 +9735,6 @@ pub mod api { 'a, T, X, - A, VestOther, DispatchError, root_mod::Event, @@ -10004,7 +9756,6 @@ pub mod api { 'a, T, X, - A, VestedTransfer, DispatchError, root_mod::Event, @@ -10030,7 +9781,6 @@ pub mod api { 'a, T, X, - A, ForceVestedTransfer, DispatchError, root_mod::Event, @@ -10050,7 +9800,6 @@ pub mod api { 'a, T, X, - A, MergeSchedules, DispatchError, root_mod::Event, @@ -10186,15 +9935,11 @@ pub mod api { } } pub mod utility { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Batch { @@ -10231,15 +9976,14 @@ pub mod api { const PALLET: &'static str = "Utility"; const FUNCTION: &'static str = "dispatch_as"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -10254,7 +9998,6 @@ pub mod api { 'a, T, X, - A, Batch, DispatchError, root_mod::Event, @@ -10270,7 +10013,6 @@ pub mod api { 'a, T, X, - A, AsDerivative, DispatchError, root_mod::Event, @@ -10288,7 +10030,6 @@ pub mod api { 'a, T, X, - A, BatchAll, DispatchError, root_mod::Event, @@ -10304,7 +10045,6 @@ pub mod api { 'a, T, X, - A, DispatchAs, DispatchError, root_mod::Event, @@ -10367,15 +10107,11 @@ pub mod api { } } pub mod identity { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct AddRegistrar { @@ -10537,15 +10273,14 @@ pub mod api { const PALLET: &'static str = "Identity"; const FUNCTION: &'static str = "quit_sub"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -10560,7 +10295,6 @@ pub mod api { 'a, T, X, - A, AddRegistrar, DispatchError, root_mod::Event, @@ -10575,7 +10309,6 @@ pub mod api { 'a, T, X, - A, SetIdentity, DispatchError, root_mod::Event, @@ -10595,7 +10328,6 @@ pub mod api { 'a, T, X, - A, SetSubs, DispatchError, root_mod::Event, @@ -10609,7 +10341,6 @@ pub mod api { 'a, T, X, - A, ClearIdentity, DispatchError, root_mod::Event, @@ -10625,7 +10356,6 @@ pub mod api { 'a, T, X, - A, RequestJudgement, DispatchError, root_mod::Event, @@ -10640,7 +10370,6 @@ pub mod api { 'a, T, X, - A, CancelRequest, DispatchError, root_mod::Event, @@ -10656,7 +10385,6 @@ pub mod api { 'a, T, X, - A, SetFee, DispatchError, root_mod::Event, @@ -10672,7 +10400,6 @@ pub mod api { 'a, T, X, - A, SetAccountId, DispatchError, root_mod::Event, @@ -10690,7 +10417,6 @@ pub mod api { 'a, T, X, - A, SetFields, DispatchError, root_mod::Event, @@ -10712,7 +10438,6 @@ pub mod api { 'a, T, X, - A, ProvideJudgement, DispatchError, root_mod::Event, @@ -10734,7 +10459,6 @@ pub mod api { 'a, T, X, - A, KillIdentity, DispatchError, root_mod::Event, @@ -10753,7 +10477,6 @@ pub mod api { 'a, T, X, - A, AddSub, DispatchError, root_mod::Event, @@ -10772,7 +10495,6 @@ pub mod api { 'a, T, X, - A, RenameSub, DispatchError, root_mod::Event, @@ -10790,7 +10512,6 @@ pub mod api { 'a, T, X, - A, RemoveSub, DispatchError, root_mod::Event, @@ -10804,7 +10525,6 @@ pub mod api { 'a, T, X, - A, QuitSub, DispatchError, root_mod::Event, @@ -11142,15 +10862,11 @@ pub mod api { } } pub mod proxy { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Proxy { @@ -11252,15 +10968,14 @@ pub mod api { const PALLET: &'static str = "Proxy"; const FUNCTION: &'static str = "proxy_announced"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -11279,7 +10994,6 @@ pub mod api { 'a, T, X, - A, Proxy, DispatchError, root_mod::Event, @@ -11300,7 +11014,6 @@ pub mod api { 'a, T, X, - A, AddProxy, DispatchError, root_mod::Event, @@ -11321,7 +11034,6 @@ pub mod api { 'a, T, X, - A, RemoveProxy, DispatchError, root_mod::Event, @@ -11339,7 +11051,6 @@ pub mod api { 'a, T, X, - A, RemoveProxies, DispatchError, root_mod::Event, @@ -11356,7 +11067,6 @@ pub mod api { 'a, T, X, - A, Anonymous, DispatchError, root_mod::Event, @@ -11379,7 +11089,6 @@ pub mod api { 'a, T, X, - A, KillAnonymous, DispatchError, root_mod::Event, @@ -11401,7 +11110,6 @@ pub mod api { 'a, T, X, - A, Announce, DispatchError, root_mod::Event, @@ -11417,7 +11125,6 @@ pub mod api { 'a, T, X, - A, RemoveAnnouncement, DispatchError, root_mod::Event, @@ -11433,7 +11140,6 @@ pub mod api { 'a, T, X, - A, RejectAnnouncement, DispatchError, root_mod::Event, @@ -11456,7 +11162,6 @@ pub mod api { 'a, T, X, - A, ProxyAnnounced, DispatchError, root_mod::Event, @@ -11695,15 +11400,11 @@ pub mod api { } } pub mod multisig { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct AsMultiThreshold1 { @@ -11760,15 +11461,14 @@ pub mod api { const PALLET: &'static str = "Multisig"; const FUNCTION: &'static str = "cancel_as_multi"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -11786,7 +11486,6 @@ pub mod api { 'a, T, X, - A, AsMultiThreshold1, DispatchError, root_mod::Event, @@ -11815,7 +11514,6 @@ pub mod api { 'a, T, X, - A, AsMulti, DispatchError, root_mod::Event, @@ -11845,7 +11543,6 @@ pub mod api { 'a, T, X, - A, ApproveAsMulti, DispatchError, root_mod::Event, @@ -11873,7 +11570,6 @@ pub mod api { 'a, T, X, - A, CancelAsMulti, DispatchError, root_mod::Event, @@ -12079,15 +11775,11 @@ pub mod api { } } pub mod bounties { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct ProposeBounty { @@ -12182,15 +11874,14 @@ pub mod api { const PALLET: &'static str = "Bounties"; const FUNCTION: &'static str = "extend_bounty_expiry"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -12206,7 +11897,6 @@ pub mod api { 'a, T, X, - A, ProposeBounty, DispatchError, root_mod::Event, @@ -12221,7 +11911,6 @@ pub mod api { 'a, T, X, - A, ApproveBounty, DispatchError, root_mod::Event, @@ -12241,7 +11930,6 @@ pub mod api { 'a, T, X, - A, ProposeCurator, DispatchError, root_mod::Event, @@ -12260,7 +11948,6 @@ pub mod api { 'a, T, X, - A, UnassignCurator, DispatchError, root_mod::Event, @@ -12275,7 +11962,6 @@ pub mod api { 'a, T, X, - A, AcceptCurator, DispatchError, root_mod::Event, @@ -12294,7 +11980,6 @@ pub mod api { 'a, T, X, - A, AwardBounty, DispatchError, root_mod::Event, @@ -12312,7 +11997,6 @@ pub mod api { 'a, T, X, - A, ClaimBounty, DispatchError, root_mod::Event, @@ -12327,7 +12011,6 @@ pub mod api { 'a, T, X, - A, CloseBounty, DispatchError, root_mod::Event, @@ -12343,7 +12026,6 @@ pub mod api { 'a, T, X, - A, ExtendBountyExpiry, DispatchError, root_mod::Event, @@ -12633,15 +12315,11 @@ pub mod api { } } pub mod tips { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct ReportAwesome { @@ -12697,15 +12375,14 @@ pub mod api { const PALLET: &'static str = "Tips"; const FUNCTION: &'static str = "slash_tip"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -12721,7 +12398,6 @@ pub mod api { 'a, T, X, - A, ReportAwesome, DispatchError, root_mod::Event, @@ -12736,7 +12412,6 @@ pub mod api { 'a, T, X, - A, RetractTip, DispatchError, root_mod::Event, @@ -12753,7 +12428,6 @@ pub mod api { 'a, T, X, - A, TipNew, DispatchError, root_mod::Event, @@ -12773,7 +12447,6 @@ pub mod api { 'a, T, X, - A, Tip, DispatchError, root_mod::Event, @@ -12788,7 +12461,6 @@ pub mod api { 'a, T, X, - A, CloseTip, DispatchError, root_mod::Event, @@ -12803,7 +12475,6 @@ pub mod api { 'a, T, X, - A, SlashTip, DispatchError, root_mod::Event, @@ -13002,15 +12673,11 @@ pub mod api { } } pub mod election_provider_multi_phase { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct SubmitUnsigned { pub raw_solution : :: std :: boxed :: Box < runtime_types :: pallet_election_provider_multi_phase :: RawSolution < runtime_types :: polkadot_runtime :: NposCompactSolution16 > > , pub witness : runtime_types :: pallet_election_provider_multi_phase :: SolutionOrSnapshotSize , } @@ -13053,15 +12720,14 @@ pub mod api { const PALLET: &'static str = "ElectionProviderMultiPhase"; const FUNCTION: &'static str = "submit"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -13077,7 +12743,6 @@ pub mod api { 'a, T, X, - A, SubmitUnsigned, DispatchError, root_mod::Event, @@ -13097,7 +12762,6 @@ pub mod api { 'a, T, X, - A, SetMinimumUntrustedScore, DispatchError, root_mod::Event, @@ -13117,7 +12781,6 @@ pub mod api { 'a, T, X, - A, SetEmergencyElectionResult, DispatchError, root_mod::Event, @@ -13133,7 +12796,6 @@ pub mod api { 'a, T, X, - A, Submit, DispatchError, root_mod::Event, @@ -13533,15 +13195,11 @@ pub mod api { } } pub mod bags_list { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Rebag { @@ -13559,15 +13217,14 @@ pub mod api { const PALLET: &'static str = "BagsList"; const FUNCTION: &'static str = "put_in_front_of"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -13582,7 +13239,6 @@ pub mod api { 'a, T, X, - A, Rebag, DispatchError, root_mod::Event, @@ -13597,7 +13253,6 @@ pub mod api { 'a, T, X, - A, PutInFrontOf, DispatchError, root_mod::Event, @@ -13900,21 +13555,15 @@ pub mod api { } } pub mod parachains_origin { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; } pub mod configuration { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive( :: subxt :: codec :: Encode, @@ -14484,15 +14133,14 @@ pub mod api { const PALLET: &'static str = "Configuration"; const FUNCTION: &'static str = "set_bypass_consistency_check"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -14507,7 +14155,6 @@ pub mod api { 'a, T, X, - A, SetValidationUpgradeCooldown, DispatchError, root_mod::Event, @@ -14522,7 +14169,6 @@ pub mod api { 'a, T, X, - A, SetValidationUpgradeDelay, DispatchError, root_mod::Event, @@ -14537,7 +14183,6 @@ pub mod api { 'a, T, X, - A, SetCodeRetentionPeriod, DispatchError, root_mod::Event, @@ -14552,7 +14197,6 @@ pub mod api { 'a, T, X, - A, SetMaxCodeSize, DispatchError, root_mod::Event, @@ -14567,7 +14211,6 @@ pub mod api { 'a, T, X, - A, SetMaxPovSize, DispatchError, root_mod::Event, @@ -14582,7 +14225,6 @@ pub mod api { 'a, T, X, - A, SetMaxHeadDataSize, DispatchError, root_mod::Event, @@ -14597,7 +14239,6 @@ pub mod api { 'a, T, X, - A, SetParathreadCores, DispatchError, root_mod::Event, @@ -14612,7 +14253,6 @@ pub mod api { 'a, T, X, - A, SetParathreadRetries, DispatchError, root_mod::Event, @@ -14627,7 +14267,6 @@ pub mod api { 'a, T, X, - A, SetGroupRotationFrequency, DispatchError, root_mod::Event, @@ -14642,7 +14281,6 @@ pub mod api { 'a, T, X, - A, SetChainAvailabilityPeriod, DispatchError, root_mod::Event, @@ -14657,7 +14295,6 @@ pub mod api { 'a, T, X, - A, SetThreadAvailabilityPeriod, DispatchError, root_mod::Event, @@ -14672,7 +14309,6 @@ pub mod api { 'a, T, X, - A, SetSchedulingLookahead, DispatchError, root_mod::Event, @@ -14687,7 +14323,6 @@ pub mod api { 'a, T, X, - A, SetMaxValidatorsPerCore, DispatchError, root_mod::Event, @@ -14702,7 +14337,6 @@ pub mod api { 'a, T, X, - A, SetMaxValidators, DispatchError, root_mod::Event, @@ -14717,7 +14351,6 @@ pub mod api { 'a, T, X, - A, SetDisputePeriod, DispatchError, root_mod::Event, @@ -14732,7 +14365,6 @@ pub mod api { 'a, T, X, - A, SetDisputePostConclusionAcceptancePeriod, DispatchError, root_mod::Event, @@ -14747,7 +14379,6 @@ pub mod api { 'a, T, X, - A, SetDisputeMaxSpamSlots, DispatchError, root_mod::Event, @@ -14762,7 +14393,6 @@ pub mod api { 'a, T, X, - A, SetDisputeConclusionByTimeOutPeriod, DispatchError, root_mod::Event, @@ -14777,7 +14407,6 @@ pub mod api { 'a, T, X, - A, SetNoShowSlots, DispatchError, root_mod::Event, @@ -14792,7 +14421,6 @@ pub mod api { 'a, T, X, - A, SetNDelayTranches, DispatchError, root_mod::Event, @@ -14807,7 +14435,6 @@ pub mod api { 'a, T, X, - A, SetZerothDelayTrancheWidth, DispatchError, root_mod::Event, @@ -14822,7 +14449,6 @@ pub mod api { 'a, T, X, - A, SetNeededApprovals, DispatchError, root_mod::Event, @@ -14837,7 +14463,6 @@ pub mod api { 'a, T, X, - A, SetRelayVrfModuloSamples, DispatchError, root_mod::Event, @@ -14852,7 +14477,6 @@ pub mod api { 'a, T, X, - A, SetMaxUpwardQueueCount, DispatchError, root_mod::Event, @@ -14867,7 +14491,6 @@ pub mod api { 'a, T, X, - A, SetMaxUpwardQueueSize, DispatchError, root_mod::Event, @@ -14882,7 +14505,6 @@ pub mod api { 'a, T, X, - A, SetMaxDownwardMessageSize, DispatchError, root_mod::Event, @@ -14897,7 +14519,6 @@ pub mod api { 'a, T, X, - A, SetUmpServiceTotalWeight, DispatchError, root_mod::Event, @@ -14912,7 +14533,6 @@ pub mod api { 'a, T, X, - A, SetMaxUpwardMessageSize, DispatchError, root_mod::Event, @@ -14927,7 +14547,6 @@ pub mod api { 'a, T, X, - A, SetMaxUpwardMessageNumPerCandidate, DispatchError, root_mod::Event, @@ -14942,7 +14561,6 @@ pub mod api { 'a, T, X, - A, SetHrmpOpenRequestTtl, DispatchError, root_mod::Event, @@ -14957,7 +14575,6 @@ pub mod api { 'a, T, X, - A, SetHrmpSenderDeposit, DispatchError, root_mod::Event, @@ -14972,7 +14589,6 @@ pub mod api { 'a, T, X, - A, SetHrmpRecipientDeposit, DispatchError, root_mod::Event, @@ -14987,7 +14603,6 @@ pub mod api { 'a, T, X, - A, SetHrmpChannelMaxCapacity, DispatchError, root_mod::Event, @@ -15002,7 +14617,6 @@ pub mod api { 'a, T, X, - A, SetHrmpChannelMaxTotalSize, DispatchError, root_mod::Event, @@ -15017,7 +14631,6 @@ pub mod api { 'a, T, X, - A, SetHrmpMaxParachainInboundChannels, DispatchError, root_mod::Event, @@ -15032,7 +14645,6 @@ pub mod api { 'a, T, X, - A, SetHrmpMaxParathreadInboundChannels, DispatchError, root_mod::Event, @@ -15047,7 +14659,6 @@ pub mod api { 'a, T, X, - A, SetHrmpChannelMaxMessageSize, DispatchError, root_mod::Event, @@ -15062,7 +14673,6 @@ pub mod api { 'a, T, X, - A, SetHrmpMaxParachainOutboundChannels, DispatchError, root_mod::Event, @@ -15077,7 +14687,6 @@ pub mod api { 'a, T, X, - A, SetHrmpMaxParathreadOutboundChannels, DispatchError, root_mod::Event, @@ -15092,7 +14701,6 @@ pub mod api { 'a, T, X, - A, SetHrmpMaxMessageNumPerCandidate, DispatchError, root_mod::Event, @@ -15107,7 +14715,6 @@ pub mod api { 'a, T, X, - A, SetUmpMaxIndividualWeight, DispatchError, root_mod::Event, @@ -15122,7 +14729,6 @@ pub mod api { 'a, T, X, - A, SetPvfCheckingEnabled, DispatchError, root_mod::Event, @@ -15137,7 +14743,6 @@ pub mod api { 'a, T, X, - A, SetPvfVotingTtl, DispatchError, root_mod::Event, @@ -15152,7 +14757,6 @@ pub mod api { 'a, T, X, - A, SetMinimumValidationUpgradeDelay, DispatchError, root_mod::Event, @@ -15167,7 +14771,6 @@ pub mod api { 'a, T, X, - A, SetBypassConsistencyCheck, DispatchError, root_mod::Event, @@ -15255,25 +14858,20 @@ pub mod api { } } pub mod paras_shared { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -15359,25 +14957,20 @@ pub mod api { } } pub mod para_inclusion { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -15535,15 +15128,11 @@ pub mod api { } } pub mod para_inherent { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Enter { @@ -15558,15 +15147,14 @@ pub mod api { const PALLET: &'static str = "ParaInherent"; const FUNCTION: &'static str = "enter"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -15586,7 +15174,6 @@ pub mod api { 'a, T, X, - A, Enter, DispatchError, root_mod::Event, @@ -15651,10 +15238,8 @@ pub mod api { } } pub mod para_scheduler { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod storage { use super::runtime_types; pub struct ValidatorGroups; @@ -15785,15 +15370,11 @@ pub mod api { } } pub mod paras { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct ForceSetCurrentCode { @@ -15870,15 +15451,14 @@ pub mod api { const PALLET: &'static str = "Paras"; const FUNCTION: &'static str = "include_pvf_check_statement"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -15894,7 +15474,6 @@ pub mod api { 'a, T, X, - A, ForceSetCurrentCode, DispatchError, root_mod::Event, @@ -15910,7 +15489,6 @@ pub mod api { 'a, T, X, - A, ForceSetCurrentHead, DispatchError, root_mod::Event, @@ -15927,7 +15505,6 @@ pub mod api { 'a, T, X, - A, ForceScheduleCodeUpgrade, DispatchError, root_mod::Event, @@ -15947,7 +15524,6 @@ pub mod api { 'a, T, X, - A, ForceNoteNewHead, DispatchError, root_mod::Event, @@ -15962,7 +15538,6 @@ pub mod api { 'a, T, X, - A, ForceQueueAction, DispatchError, root_mod::Event, @@ -15977,7 +15552,6 @@ pub mod api { 'a, T, X, - A, AddTrustedValidationCode, DispatchError, root_mod::Event, @@ -15992,7 +15566,6 @@ pub mod api { 'a, T, X, - A, PokeUnusedValidationCode, DispatchError, root_mod::Event, @@ -16010,7 +15583,6 @@ pub mod api { 'a, T, X, - A, IncludePvfCheckStatement, DispatchError, root_mod::Event, @@ -16723,15 +16295,11 @@ pub mod api { } } pub mod initializer { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive( :: subxt :: codec :: Encode, @@ -16746,15 +16314,14 @@ pub mod api { const PALLET: &'static str = "Initializer"; const FUNCTION: &'static str = "force_approve"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -16769,7 +16336,6 @@ pub mod api { 'a, T, X, - A, ForceApprove, DispatchError, root_mod::Event, @@ -16821,25 +16387,20 @@ pub mod api { } } pub mod dmp { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -16936,15 +16497,11 @@ pub mod api { } } pub mod ump { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct ServiceOverweight { @@ -16955,15 +16512,14 @@ pub mod api { const PALLET: &'static str = "Ump"; const FUNCTION: &'static str = "service_overweight"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -16979,7 +16535,6 @@ pub mod api { 'a, T, X, - A, ServiceOverweight, DispatchError, root_mod::Event, @@ -17234,15 +16789,11 @@ pub mod api { } } pub mod hrmp { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct HrmpInitOpenChannel { @@ -17300,15 +16851,14 @@ pub mod api { const PALLET: &'static str = "Hrmp"; const FUNCTION: &'static str = "hrmp_cancel_open_request"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -17325,7 +16875,6 @@ pub mod api { 'a, T, X, - A, HrmpInitOpenChannel, DispatchError, root_mod::Event, @@ -17344,7 +16893,6 @@ pub mod api { 'a, T, X, - A, HrmpAcceptOpenChannel, DispatchError, root_mod::Event, @@ -17359,7 +16907,6 @@ pub mod api { 'a, T, X, - A, HrmpCloseChannel, DispatchError, root_mod::Event, @@ -17374,7 +16921,6 @@ pub mod api { 'a, T, X, - A, ForceCleanHrmp, DispatchError, root_mod::Event, @@ -17388,7 +16934,6 @@ pub mod api { 'a, T, X, - A, ForceProcessHrmpOpen, DispatchError, root_mod::Event, @@ -17402,7 +16947,6 @@ pub mod api { 'a, T, X, - A, ForceProcessHrmpClose, DispatchError, root_mod::Event, @@ -17417,7 +16961,6 @@ pub mod api { 'a, T, X, - A, HrmpCancelOpenRequest, DispatchError, root_mod::Event, @@ -17875,10 +17418,8 @@ pub mod api { } } pub mod para_session_info { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod storage { use super::runtime_types; pub struct AssignmentKeysUnsafe; @@ -17966,15 +17507,11 @@ pub mod api { } } pub mod registrar { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Register { @@ -18031,15 +17568,14 @@ pub mod api { const PALLET: &'static str = "Registrar"; const FUNCTION: &'static str = "reserve"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -18056,7 +17592,6 @@ pub mod api { 'a, T, X, - A, Register, DispatchError, root_mod::Event, @@ -18079,7 +17614,6 @@ pub mod api { 'a, T, X, - A, ForceRegister, DispatchError, root_mod::Event, @@ -18100,7 +17634,6 @@ pub mod api { 'a, T, X, - A, Deregister, DispatchError, root_mod::Event, @@ -18116,7 +17649,6 @@ pub mod api { 'a, T, X, - A, Swap, DispatchError, root_mod::Event, @@ -18131,7 +17663,6 @@ pub mod api { 'a, T, X, - A, ForceRemoveLock, DispatchError, root_mod::Event, @@ -18145,7 +17676,6 @@ pub mod api { 'a, T, X, - A, Reserve, DispatchError, root_mod::Event, @@ -18325,15 +17855,11 @@ pub mod api { } } pub mod slots { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct ForceLease { @@ -18363,15 +17889,14 @@ pub mod api { const PALLET: &'static str = "Slots"; const FUNCTION: &'static str = "trigger_onboard"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -18390,7 +17915,6 @@ pub mod api { 'a, T, X, - A, ForceLease, DispatchError, root_mod::Event, @@ -18411,7 +17935,6 @@ pub mod api { 'a, T, X, - A, ClearAllLeases, DispatchError, root_mod::Event, @@ -18426,7 +17949,6 @@ pub mod api { 'a, T, X, - A, TriggerOnboard, DispatchError, root_mod::Event, @@ -18543,15 +18065,11 @@ pub mod api { } } pub mod auctions { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct NewAuction { @@ -18587,15 +18105,14 @@ pub mod api { const PALLET: &'static str = "Auctions"; const FUNCTION: &'static str = "cancel_auction"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -18611,7 +18128,6 @@ pub mod api { 'a, T, X, - A, NewAuction, DispatchError, root_mod::Event, @@ -18633,7 +18149,6 @@ pub mod api { 'a, T, X, - A, Bid, DispatchError, root_mod::Event, @@ -18653,7 +18168,6 @@ pub mod api { 'a, T, X, - A, CancelAuction, DispatchError, root_mod::Event, @@ -18906,15 +18420,11 @@ pub mod api { } } pub mod crowdloan { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Create { @@ -19023,15 +18533,14 @@ pub mod api { const PALLET: &'static str = "Crowdloan"; const FUNCTION: &'static str = "contribute_all"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -19053,7 +18562,6 @@ pub mod api { 'a, T, X, - A, Create, DispatchError, root_mod::Event, @@ -19079,7 +18587,6 @@ pub mod api { 'a, T, X, - A, Contribute, DispatchError, root_mod::Event, @@ -19099,7 +18606,6 @@ pub mod api { 'a, T, X, - A, Withdraw, DispatchError, root_mod::Event, @@ -19114,7 +18620,6 @@ pub mod api { 'a, T, X, - A, Refund, DispatchError, root_mod::Event, @@ -19129,7 +18634,6 @@ pub mod api { 'a, T, X, - A, Dissolve, DispatchError, root_mod::Event, @@ -19151,7 +18655,6 @@ pub mod api { 'a, T, X, - A, Edit, DispatchError, root_mod::Event, @@ -19174,7 +18677,6 @@ pub mod api { 'a, T, X, - A, AddMemo, DispatchError, root_mod::Event, @@ -19189,7 +18691,6 @@ pub mod api { 'a, T, X, - A, Poke, DispatchError, root_mod::Event, @@ -19207,7 +18708,6 @@ pub mod api { 'a, T, X, - A, ContributeAll, DispatchError, root_mod::Event, @@ -19448,15 +18948,11 @@ pub mod api { } } pub mod xcm_pallet { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; pub mod calls { - use super::{ - root_mod, - runtime_types, - }; + use super::root_mod; + use super::runtime_types; type DispatchError = runtime_types::sp_runtime::DispatchError; #[derive(:: subxt :: codec :: Encode, :: subxt :: codec :: Decode, Debug)] pub struct Send { @@ -19563,15 +19059,14 @@ pub mod api { const PALLET: &'static str = "XcmPallet"; const FUNCTION: &'static str = "limited_teleport_assets"; } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn new(client: &'a ::subxt::Client) -> Self { Self { @@ -19587,7 +19082,6 @@ pub mod api { 'a, T, X, - A, Send, DispatchError, root_mod::Event, @@ -19608,7 +19102,6 @@ pub mod api { 'a, T, X, - A, TeleportAssets, DispatchError, root_mod::Event, @@ -19631,7 +19124,6 @@ pub mod api { 'a, T, X, - A, ReserveTransferAssets, DispatchError, root_mod::Event, @@ -19652,7 +19144,6 @@ pub mod api { 'a, T, X, - A, Execute, DispatchError, root_mod::Event, @@ -19671,7 +19162,6 @@ pub mod api { 'a, T, X, - A, ForceXcmVersion, DispatchError, root_mod::Event, @@ -19689,7 +19179,6 @@ pub mod api { 'a, T, X, - A, ForceDefaultXcmVersion, DispatchError, root_mod::Event, @@ -19704,7 +19193,6 @@ pub mod api { 'a, T, X, - A, ForceSubscribeVersionNotify, DispatchError, root_mod::Event, @@ -19721,7 +19209,6 @@ pub mod api { 'a, T, X, - A, ForceUnsubscribeVersionNotify, DispatchError, root_mod::Event, @@ -19742,7 +19229,6 @@ pub mod api { 'a, T, X, - A, LimitedReserveTransferAssets, DispatchError, root_mod::Event, @@ -19767,7 +19253,6 @@ pub mod api { 'a, T, X, - A, LimitedTeleportAssets, DispatchError, root_mod::Event, @@ -27778,31 +27263,14 @@ pub mod api { } } } - #[doc = r" The default storage entry from which to fetch an account nonce, required for"] - #[doc = r" constructing a transaction."] - pub enum DefaultAccountData {} - impl ::subxt::AccountData for DefaultAccountData { - type StorageEntry = self::system::storage::AccountOwned; - type AccountId = ::subxt::sp_core::crypto::AccountId32; - type Index = ::core::primitive::u32; - fn storage_entry(account_id: Self::AccountId) -> Self::StorageEntry { - self::system::storage::AccountOwned(account_id) - } - fn nonce( - result: &::Value, - ) -> Self::Index { - result.nonce - } - } - pub struct RuntimeApi { + pub struct RuntimeApi { pub client: ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl ::core::convert::From<::subxt::Client> for RuntimeApi + impl ::core::convert::From<::subxt::Client> for RuntimeApi where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { fn from(client: ::subxt::Client) -> Self { Self { @@ -27811,11 +27279,10 @@ pub mod api { } } } - impl<'a, T, X, A> RuntimeApi + impl<'a, T, X> RuntimeApi where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { pub fn constants(&'a self) -> ConstantsApi { ConstantsApi @@ -27825,7 +27292,7 @@ pub mod api { client: &self.client, } } - pub fn tx(&'a self) -> TransactionApi<'a, T, X, A> { + pub fn tx(&'a self) -> TransactionApi<'a, T, X> { TransactionApi { client: &self.client, marker: ::core::marker::PhantomData, @@ -27849,14 +27316,28 @@ pub mod api { } pub async fn subscribe( &self, - ) -> Result<::subxt::events::EventSubscription<'a, ::subxt::events::EventSub, T, Event>, ::subxt::BasicError> - { + ) -> Result< + ::subxt::events::EventSubscription< + 'a, + ::subxt::events::EventSub, + T, + Event, + >, + ::subxt::BasicError, + > { ::subxt::events::subscribe::(self.client).await } pub async fn subscribe_finalized( &self, - ) -> Result<::subxt::events::EventSubscription<'a, ::subxt::events::FinalizedEventSub<'a, T::Header>, T, Event>, ::subxt::BasicError> - { + ) -> Result< + ::subxt::events::EventSubscription< + 'a, + ::subxt::events::FinalizedEventSub<'a, T::Header>, + T, + Event, + >, + ::subxt::BasicError, + > { ::subxt::events::subscribe_finalized::(self.client).await } } @@ -28105,150 +27586,147 @@ pub mod api { xcm_pallet::storage::StorageApi::new(self.client) } } - pub struct TransactionApi<'a, T: ::subxt::Config, X, A> { + pub struct TransactionApi<'a, T: ::subxt::Config, X> { client: &'a ::subxt::Client, - marker: ::core::marker::PhantomData<(X, A)>, + marker: ::core::marker::PhantomData, } - impl<'a, T, X, A> TransactionApi<'a, T, X, A> + impl<'a, T, X> TransactionApi<'a, T, X> where T: ::subxt::Config, X: ::subxt::SignedExtra, - A: ::subxt::AccountData, { - pub fn system(&self) -> system::calls::TransactionApi<'a, T, X, A> { + pub fn system(&self) -> system::calls::TransactionApi<'a, T, X> { system::calls::TransactionApi::new(self.client) } - pub fn scheduler(&self) -> scheduler::calls::TransactionApi<'a, T, X, A> { + pub fn scheduler(&self) -> scheduler::calls::TransactionApi<'a, T, X> { scheduler::calls::TransactionApi::new(self.client) } - pub fn preimage(&self) -> preimage::calls::TransactionApi<'a, T, X, A> { + pub fn preimage(&self) -> preimage::calls::TransactionApi<'a, T, X> { preimage::calls::TransactionApi::new(self.client) } - pub fn babe(&self) -> babe::calls::TransactionApi<'a, T, X, A> { + pub fn babe(&self) -> babe::calls::TransactionApi<'a, T, X> { babe::calls::TransactionApi::new(self.client) } - pub fn timestamp(&self) -> timestamp::calls::TransactionApi<'a, T, X, A> { + pub fn timestamp(&self) -> timestamp::calls::TransactionApi<'a, T, X> { timestamp::calls::TransactionApi::new(self.client) } - pub fn indices(&self) -> indices::calls::TransactionApi<'a, T, X, A> { + pub fn indices(&self) -> indices::calls::TransactionApi<'a, T, X> { indices::calls::TransactionApi::new(self.client) } - pub fn balances(&self) -> balances::calls::TransactionApi<'a, T, X, A> { + pub fn balances(&self) -> balances::calls::TransactionApi<'a, T, X> { balances::calls::TransactionApi::new(self.client) } - pub fn authorship(&self) -> authorship::calls::TransactionApi<'a, T, X, A> { + pub fn authorship(&self) -> authorship::calls::TransactionApi<'a, T, X> { authorship::calls::TransactionApi::new(self.client) } - pub fn staking(&self) -> staking::calls::TransactionApi<'a, T, X, A> { + pub fn staking(&self) -> staking::calls::TransactionApi<'a, T, X> { staking::calls::TransactionApi::new(self.client) } - pub fn session(&self) -> session::calls::TransactionApi<'a, T, X, A> { + pub fn session(&self) -> session::calls::TransactionApi<'a, T, X> { session::calls::TransactionApi::new(self.client) } - pub fn grandpa(&self) -> grandpa::calls::TransactionApi<'a, T, X, A> { + pub fn grandpa(&self) -> grandpa::calls::TransactionApi<'a, T, X> { grandpa::calls::TransactionApi::new(self.client) } - pub fn im_online(&self) -> im_online::calls::TransactionApi<'a, T, X, A> { + pub fn im_online(&self) -> im_online::calls::TransactionApi<'a, T, X> { im_online::calls::TransactionApi::new(self.client) } - pub fn democracy(&self) -> democracy::calls::TransactionApi<'a, T, X, A> { + pub fn democracy(&self) -> democracy::calls::TransactionApi<'a, T, X> { democracy::calls::TransactionApi::new(self.client) } - pub fn council(&self) -> council::calls::TransactionApi<'a, T, X, A> { + pub fn council(&self) -> council::calls::TransactionApi<'a, T, X> { council::calls::TransactionApi::new(self.client) } pub fn technical_committee( &self, - ) -> technical_committee::calls::TransactionApi<'a, T, X, A> { + ) -> technical_committee::calls::TransactionApi<'a, T, X> { technical_committee::calls::TransactionApi::new(self.client) } pub fn phragmen_election( &self, - ) -> phragmen_election::calls::TransactionApi<'a, T, X, A> { + ) -> phragmen_election::calls::TransactionApi<'a, T, X> { phragmen_election::calls::TransactionApi::new(self.client) } pub fn technical_membership( &self, - ) -> technical_membership::calls::TransactionApi<'a, T, X, A> { + ) -> technical_membership::calls::TransactionApi<'a, T, X> { technical_membership::calls::TransactionApi::new(self.client) } - pub fn treasury(&self) -> treasury::calls::TransactionApi<'a, T, X, A> { + pub fn treasury(&self) -> treasury::calls::TransactionApi<'a, T, X> { treasury::calls::TransactionApi::new(self.client) } - pub fn claims(&self) -> claims::calls::TransactionApi<'a, T, X, A> { + pub fn claims(&self) -> claims::calls::TransactionApi<'a, T, X> { claims::calls::TransactionApi::new(self.client) } - pub fn vesting(&self) -> vesting::calls::TransactionApi<'a, T, X, A> { + pub fn vesting(&self) -> vesting::calls::TransactionApi<'a, T, X> { vesting::calls::TransactionApi::new(self.client) } - pub fn utility(&self) -> utility::calls::TransactionApi<'a, T, X, A> { + pub fn utility(&self) -> utility::calls::TransactionApi<'a, T, X> { utility::calls::TransactionApi::new(self.client) } - pub fn identity(&self) -> identity::calls::TransactionApi<'a, T, X, A> { + pub fn identity(&self) -> identity::calls::TransactionApi<'a, T, X> { identity::calls::TransactionApi::new(self.client) } - pub fn proxy(&self) -> proxy::calls::TransactionApi<'a, T, X, A> { + pub fn proxy(&self) -> proxy::calls::TransactionApi<'a, T, X> { proxy::calls::TransactionApi::new(self.client) } - pub fn multisig(&self) -> multisig::calls::TransactionApi<'a, T, X, A> { + pub fn multisig(&self) -> multisig::calls::TransactionApi<'a, T, X> { multisig::calls::TransactionApi::new(self.client) } - pub fn bounties(&self) -> bounties::calls::TransactionApi<'a, T, X, A> { + pub fn bounties(&self) -> bounties::calls::TransactionApi<'a, T, X> { bounties::calls::TransactionApi::new(self.client) } - pub fn tips(&self) -> tips::calls::TransactionApi<'a, T, X, A> { + pub fn tips(&self) -> tips::calls::TransactionApi<'a, T, X> { tips::calls::TransactionApi::new(self.client) } pub fn election_provider_multi_phase( &self, - ) -> election_provider_multi_phase::calls::TransactionApi<'a, T, X, A> { + ) -> election_provider_multi_phase::calls::TransactionApi<'a, T, X> { election_provider_multi_phase::calls::TransactionApi::new(self.client) } - pub fn bags_list(&self) -> bags_list::calls::TransactionApi<'a, T, X, A> { + pub fn bags_list(&self) -> bags_list::calls::TransactionApi<'a, T, X> { bags_list::calls::TransactionApi::new(self.client) } - pub fn configuration(&self) -> configuration::calls::TransactionApi<'a, T, X, A> { + pub fn configuration(&self) -> configuration::calls::TransactionApi<'a, T, X> { configuration::calls::TransactionApi::new(self.client) } - pub fn paras_shared(&self) -> paras_shared::calls::TransactionApi<'a, T, X, A> { + pub fn paras_shared(&self) -> paras_shared::calls::TransactionApi<'a, T, X> { paras_shared::calls::TransactionApi::new(self.client) } - pub fn para_inclusion( - &self, - ) -> para_inclusion::calls::TransactionApi<'a, T, X, A> { + pub fn para_inclusion(&self) -> para_inclusion::calls::TransactionApi<'a, T, X> { para_inclusion::calls::TransactionApi::new(self.client) } - pub fn para_inherent(&self) -> para_inherent::calls::TransactionApi<'a, T, X, A> { + pub fn para_inherent(&self) -> para_inherent::calls::TransactionApi<'a, T, X> { para_inherent::calls::TransactionApi::new(self.client) } - pub fn paras(&self) -> paras::calls::TransactionApi<'a, T, X, A> { + pub fn paras(&self) -> paras::calls::TransactionApi<'a, T, X> { paras::calls::TransactionApi::new(self.client) } - pub fn initializer(&self) -> initializer::calls::TransactionApi<'a, T, X, A> { + pub fn initializer(&self) -> initializer::calls::TransactionApi<'a, T, X> { initializer::calls::TransactionApi::new(self.client) } - pub fn dmp(&self) -> dmp::calls::TransactionApi<'a, T, X, A> { + pub fn dmp(&self) -> dmp::calls::TransactionApi<'a, T, X> { dmp::calls::TransactionApi::new(self.client) } - pub fn ump(&self) -> ump::calls::TransactionApi<'a, T, X, A> { + pub fn ump(&self) -> ump::calls::TransactionApi<'a, T, X> { ump::calls::TransactionApi::new(self.client) } - pub fn hrmp(&self) -> hrmp::calls::TransactionApi<'a, T, X, A> { + pub fn hrmp(&self) -> hrmp::calls::TransactionApi<'a, T, X> { hrmp::calls::TransactionApi::new(self.client) } - pub fn registrar(&self) -> registrar::calls::TransactionApi<'a, T, X, A> { + pub fn registrar(&self) -> registrar::calls::TransactionApi<'a, T, X> { registrar::calls::TransactionApi::new(self.client) } - pub fn slots(&self) -> slots::calls::TransactionApi<'a, T, X, A> { + pub fn slots(&self) -> slots::calls::TransactionApi<'a, T, X> { slots::calls::TransactionApi::new(self.client) } - pub fn auctions(&self) -> auctions::calls::TransactionApi<'a, T, X, A> { + pub fn auctions(&self) -> auctions::calls::TransactionApi<'a, T, X> { auctions::calls::TransactionApi::new(self.client) } - pub fn crowdloan(&self) -> crowdloan::calls::TransactionApi<'a, T, X, A> { + pub fn crowdloan(&self) -> crowdloan::calls::TransactionApi<'a, T, X> { crowdloan::calls::TransactionApi::new(self.client) } - pub fn xcm_pallet(&self) -> xcm_pallet::calls::TransactionApi<'a, T, X, A> { + pub fn xcm_pallet(&self) -> xcm_pallet::calls::TransactionApi<'a, T, X> { xcm_pallet::calls::TransactionApi::new(self.client) } } diff --git a/subxt/tests/integration/frame/balances.rs b/subxt/tests/integration/frame/balances.rs index e151cfbb74..01e4fdd1a4 100644 --- a/subxt/tests/integration/frame/balances.rs +++ b/subxt/tests/integration/frame/balances.rs @@ -30,6 +30,10 @@ use sp_core::{ Pair as _, }; use sp_keyring::AccountKeyring; +use sp_runtime::{ + AccountId32, + MultiAddress, +}; use subxt::{ Error, Signer, @@ -94,6 +98,44 @@ async fn tx_basic_transfer() -> Result<(), subxt::Error> { Ok(()) } +#[async_std::test] +async fn multiple_transfers_work_nonce_incremented( +) -> Result<(), subxt::Error> { + let alice = pair_signer(AccountKeyring::Alice.pair()); + let bob = pair_signer(AccountKeyring::Bob.pair()); + let bob_address: MultiAddress = bob.account_id().clone().into(); + let cxt = test_context().await; + let api = &cxt.api; + + let bob_pre = api + .storage() + .system() + .account(bob.account_id(), None) + .await?; + + for _ in 0..3 { + api + .tx() + .balances() + .transfer(bob_address.clone(), 10_000) + .sign_and_submit_then_watch(&alice) + .await? + .wait_for_in_block() // Don't need to wait for finalization; this is quicker. + .await? + .wait_for_success() + .await?; + } + + let bob_post = api + .storage() + .system() + .account(bob.account_id(), None) + .await?; + + assert_eq!(bob_pre.data.free + 30_000, bob_post.data.free); + Ok(()) +} + #[async_std::test] async fn storage_total_issuance() { let cxt = test_context().await; diff --git a/subxt/tests/integration/frame/contracts.rs b/subxt/tests/integration/frame/contracts.rs index 346a6b4b38..a62aec0bcd 100644 --- a/subxt/tests/integration/frame/contracts.rs +++ b/subxt/tests/integration/frame/contracts.rs @@ -25,7 +25,6 @@ use crate::{ storage, }, system, - DefaultAccountData, DispatchError, }, test_context, @@ -63,9 +62,7 @@ impl ContractsTestContext { self.cxt.client() } - fn contracts_tx( - &self, - ) -> TransactionApi { + fn contracts_tx(&self) -> TransactionApi { self.cxt.api.tx().contracts() }