From 3a66c42c515424a28cc92857786ca15bf93fca3c Mon Sep 17 00:00:00 2001 From: muharem Date: Fri, 12 Apr 2024 18:10:31 +0200 Subject: [PATCH] renames --- .../support/src/transaction_extensions.rs | 12 +++--- .../frame/transaction-payment/src/meta_tx.rs | 40 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/substrate/frame/support/src/transaction_extensions.rs b/substrate/frame/support/src/transaction_extensions.rs index 6e6ba4a9d6a3..baef08c3f0c3 100644 --- a/substrate/frame/support/src/transaction_extensions.rs +++ b/substrate/frame/support/src/transaction_extensions.rs @@ -100,7 +100,7 @@ where )] #[codec(encode_bound())] #[codec(decode_bound())] -pub struct SignedOriginSignature +pub struct VerifyAccountSignature where V: Codec + Debug + Sync + Send + Clone + Eq + PartialEq + StaticTypeInfo, ::AccountId: @@ -109,7 +109,7 @@ where signature: Option<(V, ::AccountId)>, } -impl Default for SignedOriginSignature +impl Default for VerifyAccountSignature where V: Codec + Debug + Sync + Send + Clone + Eq + PartialEq + StaticTypeInfo, ::AccountId: @@ -120,7 +120,7 @@ where } } -impl SignedOriginSignature +impl VerifyAccountSignature where V: Codec + Debug + Sync + Send + Clone + Eq + PartialEq + StaticTypeInfo, ::AccountId: @@ -131,18 +131,18 @@ where } } -impl TransactionExtensionBase for SignedOriginSignature +impl TransactionExtensionBase for VerifyAccountSignature where V: Codec + Debug + Sync + Send + Clone + Eq + PartialEq + StaticTypeInfo, ::AccountId: Codec + Debug + Sync + Send + Clone + Eq + PartialEq + StaticTypeInfo, { - const IDENTIFIER: &'static str = "SignedOriginSignature"; + const IDENTIFIER: &'static str = "VerifyAccountSignature"; type Implicit = (); } impl TransactionExtension - for SignedOriginSignature + for VerifyAccountSignature where V: Codec + Debug + Sync + Send + Clone + Eq + PartialEq + StaticTypeInfo, ::AccountId: diff --git a/substrate/frame/transaction-payment/src/meta_tx.rs b/substrate/frame/transaction-payment/src/meta_tx.rs index 767f8ac4e44d..c06ce7323dd9 100644 --- a/substrate/frame/transaction-payment/src/meta_tx.rs +++ b/substrate/frame/transaction-payment/src/meta_tx.rs @@ -43,12 +43,12 @@ pub enum TxRelayer { /// transaction. It may also include a tip to gain additional priority in the queue. #[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)] #[scale_info(skip_type_params(T))] -pub struct MetaTransactionPayment( +pub struct RelayTransactionPayment( #[codec(compact)] BalanceOf, Option>, ); -impl MetaTransactionPayment +impl RelayTransactionPayment where BalanceOf: Send + Sync, { @@ -74,10 +74,10 @@ where } } -impl sp_std::fmt::Debug for MetaTransactionPayment { +impl sp_std::fmt::Debug for RelayTransactionPayment { #[cfg(feature = "std")] fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result { - write!(f, "MetaTransactionPayment<{:?}, {:?}>", self.0, self.1) + write!(f, "RelayTransactionPayment<{:?}, {:?}>", self.0, self.1) } #[cfg(not(feature = "std"))] fn fmt(&self, _: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result { @@ -85,8 +85,8 @@ impl sp_std::fmt::Debug for MetaTransactionPayment { } } -impl TransactionExtensionBase for MetaTransactionPayment { - const IDENTIFIER: &'static str = "MetaTransactionPayment"; +impl TransactionExtensionBase for RelayTransactionPayment { + const IDENTIFIER: &'static str = "RelayTransactionPayment"; type Implicit = (); fn weight(&self) -> Weight { @@ -94,7 +94,7 @@ impl TransactionExtensionBase for MetaTransactionPayment { } } -impl TransactionExtension for MetaTransactionPayment +impl TransactionExtension for RelayTransactionPayment where BalanceOf: Send + Sync + From, T::RuntimeCall: Dispatchable, @@ -248,7 +248,7 @@ impl SetTxRelayer for Context { )] #[codec(encode_bound())] #[codec(decode_bound())] -pub struct RelayerSignature +pub struct VerifyRelayerSignature where V: Codec + Debug + Sync + Send + Clone + Eq + PartialEq + StaticTypeInfo, ::AccountId: @@ -257,7 +257,7 @@ where pub relayer: Option<(V, ::AccountId)>, } -impl Default for RelayerSignature +impl Default for VerifyRelayerSignature where V: Codec + Debug + Sync + Send + Clone + Eq + PartialEq + StaticTypeInfo, ::AccountId: @@ -268,7 +268,7 @@ where } } -impl RelayerSignature +impl VerifyRelayerSignature where V: Codec + Debug + Sync + Send + Clone + Eq + PartialEq + StaticTypeInfo, ::AccountId: @@ -282,18 +282,18 @@ where } } -impl TransactionExtensionBase for RelayerSignature +impl TransactionExtensionBase for VerifyRelayerSignature where V: Codec + Debug + Sync + Send + Clone + Eq + PartialEq + StaticTypeInfo, ::AccountId: Codec + Debug + Sync + Send + Clone + Eq + PartialEq + StaticTypeInfo, { - const IDENTIFIER: &'static str = "RelayerSignature"; + const IDENTIFIER: &'static str = "VerifyRelayerSignature"; type Implicit = (); } impl TransactionExtension - for RelayerSignature + for VerifyRelayerSignature where V: Codec + Debug + Sync + Send + Clone + Eq + PartialEq + StaticTypeInfo, ::AccountId: @@ -360,12 +360,12 @@ mod tests { Context, >; - pub type TxExtension = (RelayerSignature, SignedTxExtension); + pub type TxExtension = (VerifyRelayerSignature, SignedTxExtension); // The part of `TxExtension` that has to be provided and signed by the transaction relayer, // the user who sponsors the transaction fee. type SignedTxExtension = ( - frame_support::transaction_extensions::SignedOriginSignature, + frame_support::transaction_extensions::VerifyAccountSignature, MetaTxExtension, ); @@ -379,7 +379,7 @@ mod tests { frame_system::CheckMortality, frame_system::CheckNonce, frame_system::CheckWeight, - MetaTransactionPayment, + RelayTransactionPayment, ); #[derive_impl(frame_system::config_preludes::TestDefaultConfig)] @@ -471,8 +471,8 @@ mod tests { frame_system::Pallet::::account(&alice_account).nonce, ), frame_system::CheckWeight::::new(), - MetaTransactionPayment::with_relayer(bob_account.clone()), - // or can be MetaTransactionPayment::with_any_relayer(), + RelayTransactionPayment::with_relayer(bob_account.clone()), + // or can be RelayTransactionPayment::with_any_relayer(), ); let meta_tx_sig = MultiSignature::Sr25519( @@ -490,7 +490,7 @@ mod tests { let (signer, meta_tx_call, meta_tx_ext, meta_tx_sig) = MetaTx::decode(&mut &meta_tx[..]).unwrap(); - let signed_tx_ext = frame_support::transaction_extensions::SignedOriginSignature::< + let signed_tx_ext = frame_support::transaction_extensions::VerifyAccountSignature::< MultiSignature, >::new_with_sign(meta_tx_sig, signer); @@ -506,7 +506,7 @@ mod tests { .using_encoded(|e| bob_keyring.sign(&blake2_256(e))), ); - let tx_ext = RelayerSignature::::new_with_relayer( + let tx_ext = VerifyRelayerSignature::::new_with_relayer( signed_tx_sign, bob_account.clone(), );