feat: sort pallets and extrinsics in alphebetical order

chungquantin · chungquantin · commit b2be21f14f4f · 2025-03-19T10:56:19.000+07:00
diff --git a/crates/pop-cli/src/commands/bench/pallet.rs b/crates/pop-cli/src/commands/bench/pallet.rs
@@ -21,7 +21,7 @@ use pop_parachains::{
 	PalletExtrinsicsRegistry, GENESIS_BUILDER_DEV_PRESET,
 };
 use std::{
-	collections::HashMap,
+	collections::BTreeMap,
 	env::current_dir,
 	path::{Path, PathBuf},
 };
@@ -240,7 +240,7 @@ impl BenchmarkPallet {
 			self.all = false;
 		}
 
-		let mut registry: PalletExtrinsicsRegistry = HashMap::default();
+		let mut registry: PalletExtrinsicsRegistry = BTreeMap::default();
 
 		cli.intro(if self.list {
 			"Listing available pallets and extrinsics"
diff --git a/crates/pop-cli/src/main.rs b/crates/pop-cli/src/main.rs
@@ -19,8 +19,9 @@ mod cli;
 mod commands;
 mod common;
 mod style;
-mod wallet_integration;
+#[cfg(feature = "telemetry")]
 use tracing_subscriber::EnvFilter;
+mod wallet_integration;
 
 #[tokio::main]
 async fn main() -> Result<()> {
diff --git a/crates/pop-parachains/src/bench/mod.rs b/crates/pop-parachains/src/bench/mod.rs
@@ -6,7 +6,7 @@ use frame_benchmarking_cli::PalletCmd;
 use sc_chain_spec::GenesisConfigBuilderRuntimeCaller;
 use sp_runtime::traits::BlakeTwo256;
 use std::{
-	collections::HashMap,
+	collections::BTreeMap,
 	fmt::Display,
 	fs::{self, File},
 	io::Read,
@@ -32,7 +32,7 @@ type HostFunctions = (
 
 /// Type alias for records where the key is the pallet name and the value is an array of its
 /// extrinsics.
-pub type PalletExtrinsicsRegistry = HashMap<String, Vec<String>>;
+pub type PalletExtrinsicsRegistry = BTreeMap<String, Vec<String>>;
 
 /// How the genesis state for benchmarking should be built.
 #[derive(clap::ValueEnum, Debug, Eq, PartialEq, Clone, Copy, EnumIter, EnumMessageDerive)]
@@ -179,6 +179,11 @@ fn process_pallet_extrinsics(output_file: PathBuf) -> anyhow::Result<PalletExtri
 		let extrinsic = record[1].trim().to_string();
 		registry.entry(pallet).or_default().push(extrinsic);
 	}
+
+	// Sort the extrinsics by alphabetical order for each pallet.
+	for extrinsics in registry.values_mut() {
+		extrinsics.sort();
+	}
 	Ok(registry)
 }
 
@@ -253,6 +258,21 @@ mod tests {
 		binary.source(false, &(), true).await?;
 
 		let registry = load_pallet_extrinsics(&runtime_path, &binary.path()).await?;
+		let pallets: Vec<String> = registry.keys().map(|k| k.clone()).collect();
+		assert_eq!(
+			pallets,
+			vec![
+				"cumulus_pallet_parachain_system",
+				"cumulus_pallet_xcmp_queue",
+				"frame_system",
+				"pallet_balances",
+				"pallet_collator_selection",
+				"pallet_message_queue",
+				"pallet_session",
+				"pallet_sudo",
+				"pallet_timestamp"
+			]
+		);
 		assert_eq!(
 			registry.get("pallet_timestamp").cloned().unwrap_or_default(),
 			["on_finalize", "set"]
