From 8d95737f4135e92b1220d13b3c69c9c0957bb489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Silva=20de=20Souza?=
<77391175+joao-paulo-parity@users.noreply.github.com>
Date: Tue, 20 Dec 2022 16:56:27 -0300
Subject: [PATCH] remove hardcoded crate versions from tests (#12950)
---
.../support/test/tests/construct_runtime.rs | 31 +++++-----
.../support/test/tests/pallet_instance.rs | 57 +++++++------------
2 files changed, 35 insertions(+), 53 deletions(-)
diff --git a/substrate/frame/support/test/tests/construct_runtime.rs b/substrate/frame/support/test/tests/construct_runtime.rs
index b1ace129362..18e4af1ac37 100644
--- a/substrate/frame/support/test/tests/construct_runtime.rs
+++ b/substrate/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::<System>().unwrap(), 30);
assert_eq!(PalletInfo::name::<System>().unwrap(), "System");
assert_eq!(PalletInfo::module_name::<System>().unwrap(), "system");
- assert_eq!(PalletInfo::crate_version::<System>().unwrap(), CrateVersion::new(3, 0, 0));
+ assert!(PalletInfo::crate_version::<System>().is_some());
assert_eq!(PalletInfo::index::<Module1_1>().unwrap(), 31);
assert_eq!(PalletInfo::name::<Module1_1>().unwrap(), "Module1_1");
assert_eq!(PalletInfo::module_name::<Module1_1>().unwrap(), "module1");
- assert_eq!(PalletInfo::crate_version::<Module1_1>().unwrap(), CrateVersion::new(3, 0, 0));
+ assert!(PalletInfo::crate_version::<Module1_1>().is_some());
assert_eq!(PalletInfo::index::<Module2>().unwrap(), 32);
assert_eq!(PalletInfo::name::<Module2>().unwrap(), "Module2");
assert_eq!(PalletInfo::module_name::<Module2>().unwrap(), "module2");
- assert_eq!(PalletInfo::crate_version::<Module2>().unwrap(), CrateVersion::new(3, 0, 0));
+ assert!(PalletInfo::crate_version::<Module2>().is_some());
assert_eq!(PalletInfo::index::<Module1_2>().unwrap(), 33);
assert_eq!(PalletInfo::name::<Module1_2>().unwrap(), "Module1_2");
assert_eq!(PalletInfo::module_name::<Module1_2>().unwrap(), "module1");
- assert_eq!(PalletInfo::crate_version::<Module1_2>().unwrap(), CrateVersion::new(3, 0, 0));
+ assert!(PalletInfo::crate_version::<Module1_2>().is_some());
assert_eq!(PalletInfo::index::<NestedModule3>().unwrap(), 34);
assert_eq!(PalletInfo::name::<NestedModule3>().unwrap(), "NestedModule3");
assert_eq!(PalletInfo::module_name::<NestedModule3>().unwrap(), "nested::module3");
- assert_eq!(PalletInfo::crate_version::<NestedModule3>().unwrap(), CrateVersion::new(3, 0, 0));
+ assert!(PalletInfo::crate_version::<NestedModule3>().is_some());
assert_eq!(PalletInfo::index::<Module3>().unwrap(), 35);
assert_eq!(PalletInfo::name::<Module3>().unwrap(), "Module3");
assert_eq!(PalletInfo::module_name::<Module3>().unwrap(), "self::module3");
- assert_eq!(PalletInfo::crate_version::<Module3>().unwrap(), CrateVersion::new(3, 0, 0));
+ assert!(PalletInfo::crate_version::<Module3>().is_some());
assert_eq!(PalletInfo::index::<Module1_3>().unwrap(), 6);
assert_eq!(PalletInfo::name::<Module1_3>().unwrap(), "Module1_3");
assert_eq!(PalletInfo::module_name::<Module1_3>().unwrap(), "module1");
- assert_eq!(PalletInfo::crate_version::<Module1_3>().unwrap(), CrateVersion::new(3, 0, 0));
+ assert!(PalletInfo::crate_version::<Module1_3>().is_some());
assert_eq!(PalletInfo::index::<Module1_4>().unwrap(), 3);
assert_eq!(PalletInfo::name::<Module1_4>().unwrap(), "Module1_4");
assert_eq!(PalletInfo::module_name::<Module1_4>().unwrap(), "module1");
- assert_eq!(PalletInfo::crate_version::<Module1_4>().unwrap(), CrateVersion::new(3, 0, 0));
+ assert!(PalletInfo::crate_version::<Module1_4>().is_some());
assert_eq!(PalletInfo::index::<Module1_5>().unwrap(), 4);
assert_eq!(PalletInfo::name::<Module1_5>().unwrap(), "Module1_5");
assert_eq!(PalletInfo::module_name::<Module1_5>().unwrap(), "module1");
- assert_eq!(PalletInfo::crate_version::<Module1_5>().unwrap(), CrateVersion::new(3, 0, 0));
+ assert!(PalletInfo::crate_version::<Module1_5>().is_some());
assert_eq!(PalletInfo::index::<Module1_6>().unwrap(), 1);
assert_eq!(PalletInfo::name::<Module1_6>().unwrap(), "Module1_6");
assert_eq!(PalletInfo::module_name::<Module1_6>().unwrap(), "module1");
- assert_eq!(PalletInfo::crate_version::<Module1_6>().unwrap(), CrateVersion::new(3, 0, 0));
+ assert!(PalletInfo::crate_version::<Module1_6>().is_some());
assert_eq!(PalletInfo::index::<Module1_7>().unwrap(), 2);
assert_eq!(PalletInfo::name::<Module1_7>().unwrap(), "Module1_7");
assert_eq!(PalletInfo::module_name::<Module1_7>().unwrap(), "module1");
- assert_eq!(PalletInfo::crate_version::<Module1_7>().unwrap(), CrateVersion::new(3, 0, 0));
+ assert!(PalletInfo::crate_version::<Module1_7>().is_some());
assert_eq!(PalletInfo::index::<Module1_8>().unwrap(), 12);
assert_eq!(PalletInfo::name::<Module1_8>().unwrap(), "Module1_8");
assert_eq!(PalletInfo::module_name::<Module1_8>().unwrap(), "module1");
- assert_eq!(PalletInfo::crate_version::<Module1_8>().unwrap(), CrateVersion::new(3, 0, 0));
+ assert!(PalletInfo::crate_version::<Module1_8>().is_some());
assert_eq!(PalletInfo::index::<Module1_9>().unwrap(), 13);
assert_eq!(PalletInfo::name::<Module1_9>().unwrap(), "Module1_9");
assert_eq!(PalletInfo::module_name::<Module1_9>().unwrap(), "module1");
- assert_eq!(PalletInfo::crate_version::<Module1_9>().unwrap(), CrateVersion::new(3, 0, 0));
+ assert!(PalletInfo::crate_version::<Module1_9>().is_some());
}
diff --git a/substrate/frame/support/test/tests/pallet_instance.rs b/substrate/frame/support/test/tests/pallet_instance.rs
index d8ad13ceda1..7fec0aa9d0e 100644
--- a/substrate/frame/support/test/tests/pallet_instance.rs
+++ b/substrate/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]
--
GitLab