Remove Default bound for AccountId (#10403)

* Remove Default for AccountId * More removals of default * Update frame/authorship/src/lib.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update frame/authorship/src/lib.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update frame/authorship/src/lib.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update frame/authorship/src/lib.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * More work * More work * Remove old code * More work * pallet-asset-tx-payment * tips * sc-consensus-babe * sc-finality-grandpa * sc-consensus-babe-rpc * sc-cli * make npos crates accept non-default account (#10420) * minimal changes to make npos pallets all work * make this pesky reduce.rs a bit cleaner * more work * more work * Tests build * Fix imonline tests * Formatting * Fixes * Fixes * Fix bench * Fixes * Fixes * Fixes * Fixes * Fixes * Formatting * Fixes * Formatting * Fixes * Formatting * Fixes * Formatting * Fixes * Formatting * Update client/keystore/src/local.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/finality-grandpa/src/lib.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/keystore/src/local.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/keystore/src/local.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update frame/staking/src/lib.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update frame/staking/src/lib.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update primitives/runtime/src/traits.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Formatting Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> Co-authored-by: kianenigma <kian@parity.io>
2026-05-30 19:51:02 +00:00 · 2021-12-13 15:03:59 +01:00
parent a4ccc26e33
commit 1e24e45ea1
118 changed files with 998 additions and 4181 deletions
@@ -244,43 +244,44 @@ where
 	}

 	fn post_dispatch(
-		pre: Self::Pre,
+		pre: Option<Self::Pre>,
 		info: &DispatchInfoOf<Self::Call>,
 		post_info: &PostDispatchInfoOf<Self::Call>,
 		len: usize,
 		result: &DispatchResult,
 	) -> Result<(), TransactionValidityError> {
-		let (tip, who, initial_payment) = pre;
-		match initial_payment {
-			InitialPayment::Native(already_withdrawn) => {
-				pallet_transaction_payment::ChargeTransactionPayment::<T>::post_dispatch(
-					(tip, who, already_withdrawn),
-					info,
-					post_info,
-					len,
-					result,
-				)?;
-			},
-			InitialPayment::Asset(already_withdrawn) => {
-				let actual_fee = pallet_transaction_payment::Pallet::<T>::compute_actual_fee(
-					len as u32, info, post_info, tip,
-				);
-				T::OnChargeAssetTransaction::correct_and_deposit_fee(
-					&who,
-					info,
-					post_info,
-					actual_fee.into(),
-					tip.into(),
-					already_withdrawn.into(),
-				)?;
-			},
-			InitialPayment::Nothing => {
-				// `actual_fee` should be zero here for any signed extrinsic. It would be non-zero
-				// here in case of unsigned extrinsics as they don't pay fees but
-				// `compute_actual_fee` is not aware of them. In both cases it's fine to just move
-				// ahead without adjusting the fee, though, so we do nothing.
-				debug_assert!(tip.is_zero(), "tip should be zero if initial fee was zero.");
-			},
+		if let Some((tip, who, initial_payment)) = pre {
+			match initial_payment {
+				InitialPayment::Native(already_withdrawn) => {
+					pallet_transaction_payment::ChargeTransactionPayment::<T>::post_dispatch(
+						Some((tip, who, already_withdrawn)),
+						info,
+						post_info,
+						len,
+						result,
+					)?;
+				},
+				InitialPayment::Asset(already_withdrawn) => {
+					let actual_fee = pallet_transaction_payment::Pallet::<T>::compute_actual_fee(
+						len as u32, info, post_info, tip,
+					);
+					T::OnChargeAssetTransaction::correct_and_deposit_fee(
+						&who,
+						info,
+						post_info,
+						actual_fee.into(),
+						tip.into(),
+						already_withdrawn.into(),
+					)?;
+				},
+				InitialPayment::Nothing => {
+					// `actual_fee` should be zero here for any signed extrinsic. It would be
+					// non-zero here in case of unsigned extrinsics as they don't pay fees but
+					// `compute_actual_fee` is not aware of them. In both cases it's fine to just
+					// move ahead without adjusting the fee, though, so we do nothing.
+					debug_assert!(tip.is_zero(), "tip should be zero if initial fee was zero.");
+				},
+			}
 		}

 		Ok(())
@@ -201,10 +201,11 @@ impl pallet_authorship::Config for Runtime {
 pub struct CreditToBlockAuthor;
 impl HandleCredit<AccountId, Assets> for CreditToBlockAuthor {
 	fn handle_credit(credit: CreditOf<AccountId, Assets>) {
-		let author = pallet_authorship::Pallet::<Runtime>::author();
-		// What to do in case paying the author fails (e.g. because `fee < min_balance`)
-		// default: drop the result which will trigger the `OnDrop` of the imbalance.
-		let _ = <Assets as Balanced<AccountId>>::resolve(&author, credit);
+		if let Some(author) = pallet_authorship::Pallet::<Runtime>::author() {
+			// What to do in case paying the author fails (e.g. because `fee < min_balance`)
+			// default: drop the result which will trigger the `OnDrop` of the imbalance.
+			let _ = <Assets as Balanced<AccountId>>::resolve(&author, credit);
+		}
 	}
 }

@@ -304,7 +305,7 @@ fn transaction_payment_in_native_possible() {
 			assert_eq!(Balances::free_balance(1), initial_balance - 5 - 5 - 10);

 			assert_ok!(ChargeAssetTxPayment::<Runtime>::post_dispatch(
-				pre,
+				Some(pre),
 				&info_from_weight(5),
 				&default_post_info(),
 				len,
@@ -319,7 +320,7 @@ fn transaction_payment_in_native_possible() {
 			assert_eq!(Balances::free_balance(2), initial_balance_for_2 - 5 - 10 - 100 - 5);

 			assert_ok!(ChargeAssetTxPayment::<Runtime>::post_dispatch(
-				pre,
+				Some(pre),
 				&info_from_weight(100),
 				&post_info_from_weight(50),
 				len,
@@ -370,7 +371,7 @@ fn transaction_payment_in_asset_possible() {
 			assert_eq!(Assets::balance(asset_id, BLOCK_AUTHOR), 0);

 			assert_ok!(ChargeAssetTxPayment::<Runtime>::post_dispatch(
-				pre,
+				Some(pre),
 				&info_from_weight(weight),
 				&default_post_info(),
 				len,
@@ -423,7 +424,7 @@ fn transaction_payment_without_fee() {
 			assert_eq!(Assets::balance(asset_id, BLOCK_AUTHOR), 0);

 			assert_ok!(ChargeAssetTxPayment::<Runtime>::post_dispatch(
-				pre,
+				Some(pre),
 				&info_from_weight(weight),
 				&post_info_from_pays(Pays::No),
 				len,
@@ -475,7 +476,7 @@ fn asset_transaction_payment_with_tip_and_refund() {

 			let final_weight = 50;
 			assert_ok!(ChargeAssetTxPayment::<Runtime>::post_dispatch(
-				pre,
+				Some(pre),
 				&info_from_weight(weight),
 				&post_info_from_weight(final_weight),
 				len,
@@ -528,7 +529,7 @@ fn payment_from_account_with_only_assets() {
 			assert_eq!(Assets::balance(asset_id, caller), balance - fee);

 			assert_ok!(ChargeAssetTxPayment::<Runtime>::post_dispatch(
-				pre,
+				Some(pre),
 				&info_from_weight(weight),
 				&default_post_info(),
 				len,
@@ -612,7 +613,7 @@ fn converted_fee_is_never_zero_if_input_fee_is_not() {
 				assert_eq!(Assets::balance(asset_id, caller), balance);

 				assert_ok!(ChargeAssetTxPayment::<Runtime>::post_dispatch(
-					pre,
+					Some(pre),
 					&info_from_pays(Pays::No),
 					&post_info_from_pays(Pays::No),
 					len,
@@ -627,7 +628,7 @@ fn converted_fee_is_never_zero_if_input_fee_is_not() {
 			assert_eq!(Assets::balance(asset_id, caller), balance - 1);

 			assert_ok!(ChargeAssetTxPayment::<Runtime>::post_dispatch(
-				pre,
+				Some(pre),
 				&info_from_weight(weight),
 				&default_post_info(),
 				len,
@@ -684,7 +685,7 @@ fn post_dispatch_fee_is_zero_if_pre_dispatch_fee_is_zero() {
 			// `Pays::Yes` on post-dispatch does not mean we pay (we never charge more than the
 			// initial fee)
 			assert_ok!(ChargeAssetTxPayment::<Runtime>::post_dispatch(
-				pre,
+				Some(pre),
 				&info_from_pays(Pays::No),
 				&post_info_from_pays(Pays::Yes),
 				len,
@@ -721,7 +722,7 @@ fn post_dispatch_fee_is_zero_if_unsigned_pre_dispatch_fee_is_zero() {
 			assert_eq!(Assets::balance(asset_id, caller), balance);
 			let weight = 1;
 			let len = 1;
-			let pre = ChargeAssetTxPayment::<Runtime>::pre_dispatch_unsigned(
+			ChargeAssetTxPayment::<Runtime>::pre_dispatch_unsigned(
 				CALL,
 				&info_from_weight(weight),
 				len,
@@ -729,17 +730,11 @@ fn post_dispatch_fee_is_zero_if_unsigned_pre_dispatch_fee_is_zero() {
 			.unwrap();

 			assert_eq!(Assets::balance(asset_id, caller), balance);
-			let (_tip, _who, initial_payment) = &pre;
-			let not_paying = match initial_payment {
-				&InitialPayment::Nothing => true,
-				_ => false,
-			};
-			assert!(not_paying, "initial payment is Nothing for unsigned extrinsics");

 			// `Pays::Yes` on post-dispatch does not mean we pay (we never charge more than the
 			// initial fee)
 			assert_ok!(ChargeAssetTxPayment::<Runtime>::post_dispatch(
-				pre,
+				None,
 				&info_from_weight(weight),
 				&post_info_from_pays(Pays::Yes),
 				len,