Remove allowing one pallet at a time.

bin/node/runtime/src/lib.rs

@@ -1334,29 +1334,9 @@ impl_runtime_apis! {
 
 	#[cfg(feature = "try-runtime")]
 	impl frame_try_runtime::TryRuntime<Block> for Runtime {
-		fn on_runtime_upgrade(target: frame_try_runtime::Target) -> Result<(Weight, Weight), sp_runtime::RuntimeString> {
+		fn on_runtime_upgrade() -> Result<(Weight, Weight), sp_runtime::RuntimeString> {
 			frame_support::debug::RuntimeLogger::init();
-
-			let weight = match target {
-				frame_try_runtime::Target::All => {
-					frame_support::debug::info!("Dry-running all on-runtime-upgrades.");
-					Executive::try_runtime_upgrade()?
-				},
-				frame_try_runtime::Target::Pallet(name) => {
-					let name = sp_std::str::from_utf8(&name).expect("pallet name is utf8-decodable; qed");
-					frame_support::debug::info!("Dry-running on-runtime-upgrade of {}.", name);
-
-					frame_try_runtime::match_pallet_on_runtime_upgrade!(name,
-						System, Utility, Babe, Timestamp, Authorship, Indices, Balances,
-						TransactionPayment, Staking, Session, Democracy, Council,
-						TechnicalCommittee, Elections, TechnicalMembership, Grandpa, Treasury,
-						Contracts, Sudo, ImOnline, AuthorityDiscovery, Offences, Historical,
-						RandomnessCollectiveFlip, Identity,  Society, Recovery, Vesting, Scheduler,
-						Proxy, Multisig, Bounties, Tips, Assets, Mmr, Lottery,
-					)
-				}
-			};
-
+			let weight = Executive::try_runtime_upgrade()?;
 			Ok((weight, RuntimeBlockWeights::get().max_block))
 		}
 	}

frame/try-runtime/src/lib.rs

@@ -19,60 +19,19 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Decode, Encode};
 use sp_std::prelude::*;
 use frame_support::weights::Weight;
 
-#[doc(hidden)]
-pub use frame_support as _support;
-
-/// Helper macro to generate the match expression needed to match a pallet name to
-/// its `on_runtime_upgrade()` implementation.
-#[macro_export]
-macro_rules! match_pallet_on_runtime_upgrade {
-	($name:ident, $($pallet:ty),* $(,)*) => {
-		match $name {
-			$(
-				stringify!($pallet) => {
-					<$pallet as $crate::_support::traits::OnRuntimeUpgrade>::pre_upgrade()?;
-					let weight = <$pallet as $crate::_support::traits::OnRuntimeUpgrade>::on_runtime_upgrade();
-					<$pallet as $crate::_support::traits::OnRuntimeUpgrade>::post_upgrade()?;
-					weight
-				},
-			)*
-			_ => panic!("Unknown pallet name provided"),
-		}
-	};
-}
-
-/// Possible targets for try-runtime testing.
-#[derive(Debug, Encode, Decode)]
-pub enum Target {
-	/// All pallets.
-	All,
-	/// A single pallet. Inner value is the encoded pallet name.
-	Pallet(Vec<u8>),
-}
-
-#[cfg(feature = "std")]
-impl sp_std::str::FromStr for Target {
-	type Err = &'static str;
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		Ok(if s.to_lowercase() == "all" {
-			Target::All
-		} else {
-			Target::Pallet(s.as_bytes().to_vec())
-		})
-	}
-}
-
 sp_api::decl_runtime_apis! {
 	/// Runtime api for testing the execution of a runtime upgrade.
 	pub trait TryRuntime {
 		/// dry-run runtime upgrades, returning the total weight consumed.
 		///
+		/// This should do EXACTLY the same operations as the runtime would have done in the case of
+		/// a runtime upgrade (e.g. pallet ordering must be the same)
+		///
 		/// Returns the consumed weight of the migration in case of a successful one, combined with
 		/// the total allowed block weight of the runtime.
-		fn on_runtime_upgrade(target: Target) -> Result<(Weight, Weight), sp_runtime::RuntimeString>;
+		fn on_runtime_upgrade() -> Result<(Weight, Weight), sp_runtime::RuntimeString>;
 	}
 }

utils/frame/try-runtime/cli/src/lib.rs

@@ -17,7 +17,7 @@
 
 //! `Structopt`-ready struct for `try-runtime`.
 
-use parity_scale_codec::{Decode, Encode};
+use parity_scale_codec::Decode;
 use std::{fmt::Debug, str::FromStr};
 use sc_service::Configuration;
 use sc_cli::{CliConfiguration, ExecutionStrategy, WasmExecutionMethod};
@@ -26,7 +26,6 @@ use sc_service::NativeExecutionDispatch;
 use sp_state_machine::StateMachine;
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 use sp_core::storage::{StorageData, StorageKey, well_known_keys};
-use frame_try_runtime::Target;
 
 /// Various commands to try out the new runtime, over configurable states.
 ///
@@ -38,10 +37,6 @@ pub struct TryRuntimeCmd {
 	#[structopt(flatten)]
 	pub shared_params: sc_cli::SharedParams,
 
-	/// The target pallet to run the migration against.
-	#[structopt(short, long, default_value = "All")]
-	pub target: Target,
-
 	/// The state to use to run the migration. Should be a valid FILE or HTTP URI.
 	#[structopt(short, long, default_value = "http://localhost:9933")]
 	pub state: State,
@@ -147,7 +142,7 @@ impl TryRuntimeCmd {
 			&mut changes,
 			&executor,
 			"TryRuntime_on_runtime_upgrade",
-			&self.target.encode(),
+			&[],
 			ext.extensions,
 			&sp_state_machine::backend::BackendRuntimeCode::new(&ext.backend)
 				.runtime_code()?,