less breaking change WIP

polkadot/runtime/common/src/claims/mod.rs

@@ -477,6 +477,7 @@ pub mod pallet {
 		}
 	}
 
+	// TODO TODO:
 	#[pallet::validate_unsigned]
 	impl<T: Config> ValidateUnsigned for Pallet<T> {
 		type Call = Call<T>;

polkadot/runtime/common/src/mock.rs

@@ -262,7 +262,7 @@ pub fn conclude_pvf_checking<T: paras::Config>(
 			validator_index: validator_index.into(),
 		};
 		let signature = key.sign(&statement.signing_payload());
-		let _ = paras::Pallet::<T>::include_pvf_check_statement_general(
+		let _ = paras::Pallet::<T>::include_pvf_check_statement(
 			frame_system::Origin::<T>::Authorized.into(),
 			statement,
 			signature.into(),

polkadot/runtime/parachains/src/disputes/slashing.rs

@@ -356,16 +356,16 @@ impl<T: Config> HandleReports<T> for () {
 }
 
 pub trait WeightInfo {
-	fn report_dispute_lost(validator_count: ValidatorSetCount) -> Weight;
-	fn authorize_report_dispute_lost() -> Weight;
+	fn report_dispute_lost_unsigned(validator_count: ValidatorSetCount) -> Weight;
+	fn authorize_report_dispute_lost_unsigned() -> Weight;
 }
 
 pub struct TestWeightInfo;
 impl WeightInfo for TestWeightInfo {
 	fn report_dispute_lost_unsigned(_validator_count: ValidatorSetCount) -> Weight {
 		Weight::zero()
 	}
-	fn authorize_report_dispute_lost() -> Weight {
+	fn authorize_report_dispute_lost_unsigned() -> Weight {
 		Weight::zero()
 	}
 }
@@ -633,7 +633,7 @@ impl<T: Config> Pallet<T> {
 	}
 }
 
-/// Methods for the `ValidateUnsigned` or authorize implementation:
+/// Methods for the `ValidateUnsigned` implementation:
 ///
 /// It restricts calls to `report_dispute_lost_unsigned` to local calls (i.e.
 /// extrinsics generated on this node) or that already in a block. This

polkadot/runtime/parachains/src/disputes/slashing/benchmarking.rs

@@ -162,7 +162,7 @@ mod benchmarks {
 	}
 
 	#[benchmark]
-	fn authorize_report_dispute_lost(n: Linear<4, { max_validators_for::<T>() }>) {
+	fn authorize_report_dispute_lost_unsigned(n: Linear<4, { max_validators_for::<T>() }>) {
 		let (session_index, key_owner_proof, validator_id) = setup_validator_set::<T>(n);
 		let dispute_proof = setup_dispute::<T>(session_index, validator_id);
 		let call = Call::<T>::report_dispute_lost {

polkadot/runtime/parachains/src/paras/benchmarking/pvf_check.rs

@@ -80,7 +80,7 @@ where
 	let stmt_n_sig = stmts.pop().unwrap();
 
 	for (stmt, sig) in stmts {
-		let r = Pallet::<T>::include_pvf_check_statement_general(RawOrigin::Authorized.into(), stmt, sig);
+		let r = Pallet::<T>::include_pvf_check_statement(RawOrigin::Authorized.into(), stmt, sig);
 		assert!(r.is_ok());
 	}
 

polkadot/runtime/parachains/src/paras/mod.rs

@@ -553,12 +553,7 @@ pub trait WeightInfo {
 	fn include_pvf_check_statement_finalize_onboarding_accept() -> Weight;
 	fn include_pvf_check_statement_finalize_onboarding_reject() -> Weight;
 	fn include_pvf_check_statement() -> Weight;
-	fn include_pvf_check_statement_general_finalize_upgrade_accept() -> Weight;
-	fn include_pvf_check_statement_general_finalize_upgrade_reject() -> Weight;
-	fn include_pvf_check_statement_general_finalize_onboarding_accept() -> Weight;
-	fn include_pvf_check_statement_general_finalize_onboarding_reject() -> Weight;
-	fn include_pvf_check_statement_general() -> Weight;
-	fn authorize_include_pvf_check_statement_general() -> Weight;
+	fn authorize_include_pvf_check_statement() -> Weight;
 }
 
 pub struct TestWeightInfo;
@@ -604,22 +599,7 @@ impl WeightInfo for TestWeightInfo {
 		// This special value is to distinguish from the finalizing variants above in tests.
 		Weight::MAX - Weight::from_parts(1, 1)
 	}
-	fn include_pvf_check_statement_general_finalize_upgrade_accept() -> Weight {
-		Weight::MAX
-	}
-	fn include_pvf_check_statement_general_finalize_upgrade_reject() -> Weight {
-		Weight::MAX
-	}
-	fn include_pvf_check_statement_general_finalize_onboarding_accept() -> Weight {
-		Weight::MAX
-	}
-	fn include_pvf_check_statement_general_finalize_onboarding_reject() -> Weight {
-		Weight::MAX
-	}
-	fn include_pvf_check_statement_general() -> Weight {
-		Weight::MAX
-	}
-	fn authorize_include_pvf_check_statement_general() -> Weight {
+	fn authorize_include_pvf_check_statement() -> Weight {
 		Weight::MAX
 	}
 }
@@ -1082,6 +1062,7 @@ pub mod pallet {
 					.max(<T as Config>::WeightInfo::include_pvf_check_statement_finalize_onboarding_reject())
 				)
 		)]
+			// TODO TODO: not deprecate accept both general and unsigned
 		#[deprecated(note = "Use `include_pvf_check_statement_general` instead.")]
 		pub fn include_pvf_check_statement(
 			origin: OriginFor<T>,

polkadot/runtime/parachains/src/paras/tests.rs

@@ -48,7 +48,7 @@ fn sign_and_include_pvf_check_statement(stmt: PvfCheckStatement) {
 		Sr25519Keyring::Ferdie,
 	];
 	let signature = validators[stmt.validator_index.0 as usize].sign(&stmt.signing_payload());
-	Paras::include_pvf_check_statement_general(RawOrigin::Authorized.into(), stmt, signature.into()).unwrap();
+	Paras::include_pvf_check_statement(RawOrigin::Authorized.into(), stmt, signature.into()).unwrap();
 }
 
 fn submit_super_majority_pvf_votes(
@@ -1449,7 +1449,7 @@ fn pvf_check_submit_vote() {
 			validators[stmt.validator_index.0 as usize].sign(&stmt.signing_payload()).into();
 
 		let call =
-			Call::<Test>::include_pvf_check_statement_general { stmt: stmt.clone(), signature: signature.clone() };
+			Call::<Test>::include_pvf_check_statement { stmt: stmt.clone(), signature: signature.clone() };
 
 		with_transaction_unchecked(|| {
 			let authorized = call.authorize(TransactionSource::InBlock)
@@ -1460,7 +1460,7 @@ fn pvf_check_submit_vote() {
 				return TransactionOutcome::Rollback(Err(err));
 			}
 
-			let res = Paras::include_pvf_check_statement_general(
+			let res = Paras::include_pvf_check_statement(
 				RawOrigin::Authorized.into(),
 				stmt.clone(),
 				signature.clone()
@@ -1606,13 +1606,13 @@ fn include_pvf_check_statement_refunds_weight() {
 
 		// Verify that just vote submission is priced accordingly.
 		for (stmt, sig) in stmts {
-			let r = Paras::include_pvf_check_statement_general(RawOrigin::Authorized.into(), stmt, sig.into()).unwrap();
-			assert_eq!(r.actual_weight, Some(TestWeightInfo::include_pvf_check_statement_general()));
+			let r = Paras::include_pvf_check_statement(RawOrigin::Authorized.into(), stmt, sig.into()).unwrap();
+			assert_eq!(r.actual_weight, Some(TestWeightInfo::include_pvf_check_statement()));
 		}
 
 		// Verify that the last statement is priced maximally.
 		let (stmt, sig) = last_one;
-		let r = Paras::include_pvf_check_statement_general(RawOrigin::Authorized.into(), stmt, sig.into()).unwrap();
+		let r = Paras::include_pvf_check_statement(RawOrigin::Authorized.into(), stmt, sig.into()).unwrap();
 		assert_eq!(r.actual_weight, None);
 	});
 }

polkadot/runtime/rococo/src/weights/polkadot_runtime_common_claims.rs

@@ -179,16 +179,10 @@ impl<T: frame_system::Config> polkadot_runtime_common::claims::WeightInfo for We
 			.saturating_add(Weight::from_parts(0, 3761))
 			.saturating_add(T::DbWeight::get().reads(2))
 	}
-	fn claim_general() -> Weight {
+	fn authorize_claim() -> Weight {
 		Weight::zero()
 	}
-	fn claim_attest_general() -> Weight {
-		Weight::zero()
-	}
-	fn authorize_claim_general() -> Weight {
-		Weight::zero()
-	}
-	fn authorize_claim_attest_general() -> Weight {
+	fn authorize_claim_attest() -> Weight {
 		Weight::zero()
 	}
 }

polkadot/runtime/rococo/src/weights/polkadot_runtime_parachains_paras.rs

@@ -295,10 +295,5 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	fn include_pvf_check_statement_general_finalize_upgrade_accept() -> Weight { Weight::zero() }
-	fn include_pvf_check_statement_general_finalize_upgrade_reject() -> Weight { Weight::zero() }
-	fn include_pvf_check_statement_general_finalize_onboarding_accept() -> Weight { Weight::zero() }
-	fn include_pvf_check_statement_general_finalize_onboarding_reject() -> Weight { Weight::zero() }
-	fn include_pvf_check_statement_general() -> Weight { Weight::zero() }
-	fn authorize_include_pvf_check_statement_general() -> Weight { Weight::zero() }
+	fn authorize_include_pvf_check_statement() -> Weight { Weight::zero() }
 }

polkadot/runtime/westend/src/weights/polkadot_runtime_parachains_disputes_slashing.rs

@@ -98,7 +98,7 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::disputes::slashing::W
 			.saturating_add(T::DbWeight::get().writes(9))
 			.saturating_add(Weight::from_parts(0, 192).saturating_mul(n.into()))
 	}
-	fn authorize_report_dispute_lost_general() -> Weight {
+	fn authorize_report_dispute_lost_unsigned() -> Weight {
 		Weight::zero()
 	}
 }

polkadot/runtime/westend/src/weights/polkadot_runtime_parachains_paras.rs

@@ -286,10 +286,5 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	fn include_pvf_check_statement_general_finalize_upgrade_accept() -> Weight { Weight::zero() }
-	fn include_pvf_check_statement_general_finalize_upgrade_reject() -> Weight { Weight::zero() }
-	fn include_pvf_check_statement_general_finalize_onboarding_accept() -> Weight { Weight::zero() }
-	fn include_pvf_check_statement_general_finalize_onboarding_reject() -> Weight { Weight::zero() }
-	fn include_pvf_check_statement_general() -> Weight { Weight::zero() }
-	fn authorize_include_pvf_check_statement_general() -> Weight { Weight::zero() }
+	fn authorize_include_pvf_check_statement() -> Weight { Weight::zero() }
 }

substrate/frame/mixnet/src/lib.rs

@@ -251,6 +251,7 @@ pub mod pallet {
 		/// The mixnode set for the very first session.
 		pub mixnodes: BoundedVec<BoundedMixnodeFor<T>, T::MaxAuthorities>,
 	}
+	// TODO TODO: support validate unsigned again
 
 	#[pallet::genesis_build]
 	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {