Companion of paritytech/substrate#10402 part.1

Author: aurexav

frame/bridge/ecdsa-authority/src/mock.rs

@@ -21,7 +21,7 @@ use core::iter;
 // --- crates.io ---
 use libsecp256k1::{PublicKey, SecretKey};
 // --- paritytech ---
-use frame_support::traits::{Everything, GenesisBuild, OnInitialize};
+use frame_support::traits::{ConstU32, Everything, GenesisBuild, OnInitialize};
 use frame_system::mocking::*;
 use sp_io::{hashing, TestExternalities};
 use sp_runtime::{
@@ -73,7 +73,6 @@ impl frame_system::Config for Test {
 
 frame_support::parameter_types! {
 	pub const ChainId: &'static [u8] = b"46";
-	pub const MaxAuthorities: u32 = 3;
 	pub const MaxPendingPeriod: BlockNumber = 5;
 	pub const SignThreshold: Perbill = Perbill::from_percent(60);
 	pub const SyncInterval: BlockNumber = 3;
@@ -82,7 +81,7 @@ frame_support::parameter_types! {
 impl Config for Test {
 	type ChainId = ChainId;
 	type Event = Event;
-	type MaxAuthorities = MaxAuthorities;
+	type MaxAuthorities = ConstU32<3>;
 	type MaxPendingPeriod = MaxPendingPeriod;
 	type MessageRoot = MessageRoot;
 	type SignThreshold = SignThreshold;

node/runtime/pangolin/src/pallets/ecdsa_authority.rs

@@ -7,7 +7,6 @@ use darwinia_message_gadget::MessageRootGetter;
 
 frame_support::parameter_types! {
 	pub const ChainId: &'static [u8] = b"43";
-	pub const MaxEcdsaAuthorities: u32 = 3;
 	pub const MaxPendingPeriod: BlockNumber = 100;
 	pub const SignThreshold: Perbill = Perbill::from_percent(60);
 	pub const SyncInterval: BlockNumber = 10;
@@ -17,7 +16,7 @@ static_assertions::const_assert!(SyncInterval::get() < MaxPendingPeriod::get());
 impl Config for Runtime {
 	type ChainId = ChainId;
 	type Event = Event;
-	type MaxAuthorities = MaxEcdsaAuthorities;
+	type MaxAuthorities = ConstU32<3>;
 	type MaxPendingPeriod = MaxPendingPeriod;
 	type MessageRoot = MessageRootGetter<Self>;
 	type SignThreshold = SignThreshold;

node/runtime/pangolin/src/pallets/mod.rs

@@ -1,3 +1,6 @@
+pub mod shared_imports;
+pub use shared_imports::*;
+
 pub mod system;
 pub use system::*;
 

node/runtime/pangolin/src/pallets/shared_imports.rs

@@ -0,0 +1 @@
+pub use frame_support::traits::ConstU32;

node/runtime/pangoro/src/pallets/ecdsa_authority.rs

@@ -7,7 +7,6 @@ use darwinia_message_gadget::MessageRootGetter;
 
 frame_support::parameter_types! {
 	pub const ChainId: &'static [u8] = b"45";
-	pub const MaxEcdsaAuthorities: u32 = 3;
 	pub const MaxPendingPeriod: BlockNumber = 100;
 	pub const SignThreshold: Perbill = Perbill::from_percent(60);
 	pub const SyncInterval: BlockNumber = 10;
@@ -17,7 +16,7 @@ static_assertions::const_assert!(SyncInterval::get() < MaxPendingPeriod::get());
 impl Config for Runtime {
 	type ChainId = ChainId;
 	type Event = Event;
-	type MaxAuthorities = MaxEcdsaAuthorities;
+	type MaxAuthorities = ConstU32<3>;
 	type MaxPendingPeriod = MaxPendingPeriod;
 	type MessageRoot = MessageRootGetter<Self>;
 	type SignThreshold = SignThreshold;

node/runtime/pangoro/src/pallets/mod.rs

@@ -1,3 +1,6 @@
+pub mod shared_imports;
+pub use shared_imports::*;
+
 pub mod system;
 pub use system::*;
 

node/runtime/pangoro/src/pallets/shared_imports.rs

@@ -0,0 +1 @@
+pub use frame_support::traits::ConstU32;