Adjustable collator count (#1012)

pallet/ecdsa-authority/tests/tests.rs

@@ -430,7 +430,7 @@ fn submit_new_message_root_signature() {
 		// Case 3.
 		let s_3 = sign(&k_3, &message.0);
 		assert_noop!(
-			EcdsaAuthority::submit_new_message_root_signature(RuntimeOrigin::signed(a_3), s_3,),
+			EcdsaAuthority::submit_new_message_root_signature(RuntimeOrigin::signed(a_3), s_3),
 			<Error<Runtime>>::NotAuthority
 		);
 

pallet/staking/src/lib.rs

@@ -245,6 +245,8 @@ pub mod pallet {
 		NotStaker,
 		/// Target is not a collator.
 		TargetNotCollator,
+		/// Collator count mustn't be zero.
+		ZeroCollatorCount,
 	}
 
 	/// All staking ledgers.
@@ -327,6 +329,10 @@ pub mod pallet {
 	#[pallet::genesis_build]
 	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
 		fn build(&self) {
+			if self.collator_count == 0 {
+				panic!("[pallet::staking] collator count mustn't be 0");
+			}
+
 			<SessionStartTime<T>>::put(self.now);
 			<ElapsedTime<T>>::put(self.elapsed_time);
 			<CollatorCount<T>>::put(self.collator_count);
@@ -570,6 +576,25 @@ pub mod pallet {
 
 			Ok(())
 		}
+
+		/// Set collator count.
+		///
+		/// This will apply to the incoming session.
+		///
+		/// Require root origin.
+		#[pallet::call_index(7)]
+		#[pallet::weight(0)]
+		pub fn set_collator_count(origin: OriginFor<T>, count: u32) -> DispatchResult {
+			ensure_root(origin)?;
+
+			if count == 0 {
+				return Err(<Error<T>>::ZeroCollatorCount)?;
+			}
+
+			<CollatorCount<T>>::put(count);
+
+			Ok(())
+		}
 	}
 	impl<T> Pallet<T>
 	where

pallet/staking/tests/mock.rs

@@ -290,7 +290,6 @@ fn initialize_block(number: u64) {
 	<AllPalletsWithSystem as OnInitialize<u64>>::on_initialize(number);
 }
 
-#[derive(Default)]
 pub struct ExtBuilder {
 	collator_count: u32,
 }
@@ -332,3 +331,8 @@ impl ExtBuilder {
 		ext
 	}
 }
+impl Default for ExtBuilder {
+	fn default() -> Self {
+		Self { collator_count: 1 }
+	}
+}

pallet/staking/tests/tests.rs

@@ -27,7 +27,7 @@ use darwinia_staking::*;
 use dc_types::{Balance, UNIT};
 // substrate
 use frame_support::{assert_noop, assert_ok, BoundedVec};
-use sp_runtime::{assert_eq_error_rate, Perbill};
+use sp_runtime::{assert_eq_error_rate, DispatchError, Perbill};
 
 #[test]
 fn stake_should_work() {
@@ -403,6 +403,21 @@ fn chill_should_work() {
 	});
 }
 
+#[test]
+fn set_collator_count_should_work() {
+	ExtBuilder::default().build().execute_with(|| {
+		assert_noop!(
+			Staking::set_collator_count(RuntimeOrigin::signed(1), 1),
+			DispatchError::BadOrigin
+		);
+		assert_noop!(
+			Staking::set_collator_count(RuntimeOrigin::root(), 0),
+			<Error<Runtime>>::ZeroCollatorCount
+		);
+		assert_ok!(Staking::set_collator_count(RuntimeOrigin::root(), 1));
+	});
+}
+
 #[test]
 fn power_should_work() {
 	ExtBuilder::default().build().execute_with(|| {