diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs index b1ace12936241..18e4af1ac3739 100644 --- a/frame/support/test/tests/construct_runtime.rs +++ b/frame/support/test/tests/construct_runtime.rs @@ -22,10 +22,7 @@ #![recursion_limit = "128"] use codec::MaxEncodedLen; -use frame_support::{ - parameter_types, - traits::{CrateVersion, PalletInfo as _}, -}; +use frame_support::{parameter_types, traits::PalletInfo as _}; use scale_info::TypeInfo; use sp_core::{sr25519, H256}; use sp_runtime::{ @@ -733,65 +730,65 @@ fn pallet_in_runtime_is_correct() { assert_eq!(PalletInfo::index::().unwrap(), 30); assert_eq!(PalletInfo::name::().unwrap(), "System"); assert_eq!(PalletInfo::module_name::().unwrap(), "system"); - assert_eq!(PalletInfo::crate_version::().unwrap(), CrateVersion::new(3, 0, 0)); + assert!(PalletInfo::crate_version::().is_some()); assert_eq!(PalletInfo::index::().unwrap(), 31); assert_eq!(PalletInfo::name::().unwrap(), "Module1_1"); assert_eq!(PalletInfo::module_name::().unwrap(), "module1"); - assert_eq!(PalletInfo::crate_version::().unwrap(), CrateVersion::new(3, 0, 0)); + assert!(PalletInfo::crate_version::().is_some()); assert_eq!(PalletInfo::index::().unwrap(), 32); assert_eq!(PalletInfo::name::().unwrap(), "Module2"); assert_eq!(PalletInfo::module_name::().unwrap(), "module2"); - assert_eq!(PalletInfo::crate_version::().unwrap(), CrateVersion::new(3, 0, 0)); + assert!(PalletInfo::crate_version::().is_some()); assert_eq!(PalletInfo::index::().unwrap(), 33); assert_eq!(PalletInfo::name::().unwrap(), "Module1_2"); assert_eq!(PalletInfo::module_name::().unwrap(), "module1"); - assert_eq!(PalletInfo::crate_version::().unwrap(), CrateVersion::new(3, 0, 0)); + assert!(PalletInfo::crate_version::().is_some()); assert_eq!(PalletInfo::index::().unwrap(), 34); assert_eq!(PalletInfo::name::().unwrap(), "NestedModule3"); assert_eq!(PalletInfo::module_name::().unwrap(), "nested::module3"); - assert_eq!(PalletInfo::crate_version::().unwrap(), CrateVersion::new(3, 0, 0)); + assert!(PalletInfo::crate_version::().is_some()); assert_eq!(PalletInfo::index::().unwrap(), 35); assert_eq!(PalletInfo::name::().unwrap(), "Module3"); assert_eq!(PalletInfo::module_name::().unwrap(), "self::module3"); - assert_eq!(PalletInfo::crate_version::().unwrap(), CrateVersion::new(3, 0, 0)); + assert!(PalletInfo::crate_version::().is_some()); assert_eq!(PalletInfo::index::().unwrap(), 6); assert_eq!(PalletInfo::name::().unwrap(), "Module1_3"); assert_eq!(PalletInfo::module_name::().unwrap(), "module1"); - assert_eq!(PalletInfo::crate_version::().unwrap(), CrateVersion::new(3, 0, 0)); + assert!(PalletInfo::crate_version::().is_some()); assert_eq!(PalletInfo::index::().unwrap(), 3); assert_eq!(PalletInfo::name::().unwrap(), "Module1_4"); assert_eq!(PalletInfo::module_name::().unwrap(), "module1"); - assert_eq!(PalletInfo::crate_version::().unwrap(), CrateVersion::new(3, 0, 0)); + assert!(PalletInfo::crate_version::().is_some()); assert_eq!(PalletInfo::index::().unwrap(), 4); assert_eq!(PalletInfo::name::().unwrap(), "Module1_5"); assert_eq!(PalletInfo::module_name::().unwrap(), "module1"); - assert_eq!(PalletInfo::crate_version::().unwrap(), CrateVersion::new(3, 0, 0)); + assert!(PalletInfo::crate_version::().is_some()); assert_eq!(PalletInfo::index::().unwrap(), 1); assert_eq!(PalletInfo::name::().unwrap(), "Module1_6"); assert_eq!(PalletInfo::module_name::().unwrap(), "module1"); - assert_eq!(PalletInfo::crate_version::().unwrap(), CrateVersion::new(3, 0, 0)); + assert!(PalletInfo::crate_version::().is_some()); assert_eq!(PalletInfo::index::().unwrap(), 2); assert_eq!(PalletInfo::name::().unwrap(), "Module1_7"); assert_eq!(PalletInfo::module_name::().unwrap(), "module1"); - assert_eq!(PalletInfo::crate_version::().unwrap(), CrateVersion::new(3, 0, 0)); + assert!(PalletInfo::crate_version::().is_some()); assert_eq!(PalletInfo::index::().unwrap(), 12); assert_eq!(PalletInfo::name::().unwrap(), "Module1_8"); assert_eq!(PalletInfo::module_name::().unwrap(), "module1"); - assert_eq!(PalletInfo::crate_version::().unwrap(), CrateVersion::new(3, 0, 0)); + assert!(PalletInfo::crate_version::().is_some()); assert_eq!(PalletInfo::index::().unwrap(), 13); assert_eq!(PalletInfo::name::().unwrap(), "Module1_9"); assert_eq!(PalletInfo::module_name::().unwrap(), "module1"); - assert_eq!(PalletInfo::crate_version::().unwrap(), CrateVersion::new(3, 0, 0)); + assert!(PalletInfo::crate_version::().is_some()); } diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs index d8ad13ceda1dd..7fec0aa9d0e07 100644 --- a/frame/support/test/tests/pallet_instance.rs +++ b/frame/support/test/tests/pallet_instance.rs @@ -619,44 +619,29 @@ fn storage_expand() { #[test] fn pallet_metadata_expands() { - use frame_support::traits::{CrateVersion, PalletInfoData, PalletsInfoAccess}; + use frame_support::traits::PalletsInfoAccess; let mut infos = AllPalletsWithSystem::infos(); infos.sort_by_key(|x| x.index); - assert_eq!( - infos, - vec![ - PalletInfoData { - index: 0, - name: "System", - module_name: "frame_system", - crate_version: CrateVersion { major: 4, minor: 0, patch: 0 }, - }, - PalletInfoData { - index: 1, - name: "Example", - module_name: "pallet", - crate_version: CrateVersion { major: 3, minor: 0, patch: 0 }, - }, - PalletInfoData { - index: 2, - name: "Instance1Example", - module_name: "pallet", - crate_version: CrateVersion { major: 3, minor: 0, patch: 0 }, - }, - PalletInfoData { - index: 3, - name: "Example2", - module_name: "pallet2", - crate_version: CrateVersion { major: 3, minor: 0, patch: 0 }, - }, - PalletInfoData { - index: 4, - name: "Instance1Example2", - module_name: "pallet2", - crate_version: CrateVersion { major: 3, minor: 0, patch: 0 }, - }, - ] - ); + + assert_eq!(infos[0].index, 0); + assert_eq!(infos[0].name, "System"); + assert_eq!(infos[0].module_name, "frame_system"); + + assert_eq!(infos[1].index, 1); + assert_eq!(infos[1].name, "Example"); + assert_eq!(infos[1].module_name, "pallet"); + + assert_eq!(infos[2].index, 2); + assert_eq!(infos[2].name, "Instance1Example"); + assert_eq!(infos[2].module_name, "pallet"); + + assert_eq!(infos[3].index, 3); + assert_eq!(infos[3].name, "Example2"); + assert_eq!(infos[3].module_name, "pallet2"); + + assert_eq!(infos[4].index, 4); + assert_eq!(infos[4].name, "Instance1Example2"); + assert_eq!(infos[4].module_name, "pallet2"); } #[test]