Revert the additional Extrinsic' associated types

Signed-off-by: Alexandru Vasile <[email protected]>

bin/node/runtime/src/lib.rs

@@ -1267,14 +1267,7 @@ where
 		public: <Signature as traits::Verify>::Signer,
 		account: AccountId,
 		nonce: Index,
-	) -> Option<(
-		RuntimeCall,
-		(
-			<UncheckedExtrinsic as traits::Extrinsic>::SignatureAddress,
-			<UncheckedExtrinsic as traits::Extrinsic>::Signature,
-			<UncheckedExtrinsic as traits::Extrinsic>::SignatureExtra,
-		),
-	)> {
+	) -> Option<(RuntimeCall, <UncheckedExtrinsic as traits::Extrinsic>::SignaturePayload)> {
 		let tip = 0;
 		// take the biggest period possible.
 		let period =

frame/examples/offchain-worker/src/tests.rs

@@ -102,15 +102,8 @@ where
 		_public: <Signature as Verify>::Signer,
 		_account: AccountId,
 		nonce: u64,
-	) -> Option<(
-		RuntimeCall,
-		(
-			<Extrinsic as ExtrinsicT>::SignatureAddress,
-			<Extrinsic as ExtrinsicT>::Signature,
-			<Extrinsic as ExtrinsicT>::SignatureExtra,
-		),
-	)> {
-		Some((call, (nonce, (), ())))
+	) -> Option<(RuntimeCall, <Extrinsic as ExtrinsicT>::SignaturePayload)> {
+		Some((call, (nonce, ())))
 	}
 }
 

frame/executive/src/lib.rs

@@ -956,8 +956,8 @@ mod tests {
 		)
 	}
 
-	fn sign_extra(who: u64, nonce: u64, fee: Balance) -> Option<(u64, (), SignedExtra)> {
-		Some((who, (), extra(nonce, fee)))
+	fn sign_extra(who: u64, nonce: u64, fee: Balance) -> Option<(u64, SignedExtra)> {
+		Some((who, extra(nonce, fee)))
 	}
 
 	fn call_transfer(dest: u64, value: u64) -> RuntimeCall {

frame/system/src/offchain.rs

@@ -86,11 +86,7 @@ where
 	/// Submit transaction onchain by providing the call and an optional signature
 	pub fn submit_transaction(
 		call: <T as SendTransactionTypes<LocalCall>>::OverarchingCall,
-		signature: Option<(
-			<T::Extrinsic as ExtrinsicT>::SignatureAddress,
-			<T::Extrinsic as ExtrinsicT>::Signature,
-			<T::Extrinsic as ExtrinsicT>::SignatureExtra,
-		)>,
+		signature: Option<<T::Extrinsic as ExtrinsicT>::SignaturePayload>,
 	) -> Result<(), ()> {
 		let xt = T::Extrinsic::new(call, signature).ok_or(())?;
 		sp_io::offchain::submit_transaction(xt.encode())
@@ -491,14 +487,7 @@ pub trait CreateSignedTransaction<LocalCall>:
 		public: Self::Public,
 		account: Self::AccountId,
 		nonce: Self::Index,
-	) -> Option<(
-		Self::OverarchingCall,
-		(
-			<Self::Extrinsic as ExtrinsicT>::SignatureAddress,
-			<Self::Extrinsic as ExtrinsicT>::Signature,
-			<Self::Extrinsic as ExtrinsicT>::SignatureExtra,
-		),
-	)>;
+	) -> Option<(Self::OverarchingCall, <Self::Extrinsic as ExtrinsicT>::SignaturePayload)>;
 }
 
 /// A message signer.

frame/transaction-payment/src/tests.rs

@@ -288,7 +288,7 @@ fn query_info_and_fee_details_works() {
 	let call = RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 2, value: 69 });
 	let origin = 111111;
 	let extra = ();
-	let xt = TestXt::new(call.clone(), Some((origin, (), extra)));
+	let xt = TestXt::new(call.clone(), Some((origin, extra)));
 	let info = xt.get_dispatch_info();
 	let ext = xt.encode();
 	let len = ext.len() as u32;

primitives/runtime/src/lib.rs

@@ -902,15 +902,13 @@ impl<'a> ::serde::Deserialize<'a> for OpaqueExtrinsic {
 	{
 		let r = ::sp_core::bytes::deserialize(de)?;
 		Decode::decode(&mut &r[..])
-			.map_err(|e: codec::Error| ::serde::de::Error::custom(format!("Decode error: {}", e)))
+			.map_err(|e| ::serde::de::Error::custom(format!("Decode error: {}", e)))
 	}
 }
 
 impl traits::Extrinsic for OpaqueExtrinsic {
 	type Call = ();
-	type SignatureAddress = ();
-	type Signature = ();
-	type SignatureExtra = ();
+	type SignaturePayload = ();
 }
 
 /// Print something that implements `Printable` from the runtime.

primitives/runtime/src/testing.rs

@@ -204,9 +204,7 @@ pub struct ExtrinsicWrapper<Xt>(Xt);
 
 impl<Xt> traits::Extrinsic for ExtrinsicWrapper<Xt> {
 	type Call = ();
-	type SignatureAddress = ();
-	type Signature = ();
-	type SignatureExtra = ();
+	type SignaturePayload = ();
 
 	fn is_signed(&self) -> Option<bool> {
 		None
@@ -288,14 +286,14 @@ where
 #[derive(PartialEq, Eq, Clone, Encode, Decode, TypeInfo)]
 pub struct TestXt<Call, Extra> {
 	/// Signature of the extrinsic.
-	pub signature: Option<(u64, (), Extra)>,
+	pub signature: Option<(u64, Extra)>,
 	/// Call of the extrinsic.
 	pub call: Call,
 }
 
 impl<Call, Extra> TestXt<Call, Extra> {
 	/// Create a new `TextXt`.
-	pub fn new(call: Call, signature: Option<(u64, (), Extra)>) -> Self {
+	pub fn new(call: Call, signature: Option<(u64, Extra)>) -> Self {
 		Self { call, signature }
 	}
 }
@@ -335,18 +333,13 @@ impl<Call: Codec + Sync + Send, Context, Extra> Checkable<Context> for TestXt<Ca
 
 impl<Call: Codec + Sync + Send, Extra> traits::Extrinsic for TestXt<Call, Extra> {
 	type Call = Call;
-	type SignatureAddress = u64;
-	type Signature = ();
-	type SignatureExtra = Extra;
+	type SignaturePayload = (u64, Extra);
 
 	fn is_signed(&self) -> Option<bool> {
 		Some(self.signature.is_some())
 	}
 
-	fn new(
-		c: Call,
-		sig: Option<(Self::SignatureAddress, Self::Signature, Self::SignatureExtra)>,
-	) -> Option<Self> {
+	fn new(c: Call, sig: Option<Self::SignaturePayload>) -> Option<Self> {
 		Some(TestXt { signature: sig, call: c })
 	}
 }
@@ -383,7 +376,7 @@ where
 		info: &DispatchInfoOf<Self::Call>,
 		len: usize,
 	) -> TransactionValidity {
-		if let Some((ref id, _, ref extra)) = self.signature {
+		if let Some((ref id, ref extra)) = self.signature {
 			Extra::validate(extra, id, &self.call, info, len)
 		} else {
 			let valid = Extra::validate_unsigned(&self.call, info, len)?;
@@ -399,7 +392,7 @@ where
 		info: &DispatchInfoOf<Self::Call>,
 		len: usize,
 	) -> ApplyExtrinsicResultWithInfo<PostDispatchInfoOf<Self::Call>> {
-		let maybe_who = if let Some((who, _, extra)) = self.signature {
+		let maybe_who = if let Some((who, extra)) = self.signature {
 			Extra::pre_dispatch(extra, &who, &self.call, info, len)?;
 			Some(who)
 		} else {