Code Optimize & Fix Relay Authorities Bug

frame/bridge/relay-authorities/src/lib.rs

@@ -420,7 +420,6 @@ decl_module! {
 		pub fn submit_signed_mmr_root(
 			origin,
 			block_number: BlockNumber<T>,
-			mmr_root: MMRRoot<T>,
 			signature: RelayAuthoritySignature<T, I>
 		) {
 			let authority = ensure_signed(origin)?;
@@ -441,14 +440,17 @@ decl_module! {
 				&authorities,
 				&authority
 			).ok_or(<Error<T, I>>::AuthorityNE)?;
+			let mmr_root =
+				T::DarwiniaMMR::get_root(block_number).ok_or(<Error<T, I>>::DarwiniaMMRRootNRY)?;
+
 			// The message is composed of:
 			//
 			// hash(codec(spec_name: String, block number: Compact<BlockNumber>, mmr_root: Hash))
 			let message = T::Sign::hash(
 				&_S {
 					_1: T::Version::get().spec_name,
 					_2: block_number,
-					_3: T::DarwiniaMMR::get_root(block_number).ok_or(<Error<T, I>>::DarwiniaMMRRootNRY)?
+					_3: mmr_root
 				}
 				.encode()
 			);
@@ -460,7 +462,7 @@ decl_module! {
 
 			signatures.push((authority, signature));
 
-			if Perbill::from_rational_approximation(signatures.len() as u32 + 1, authorities.len() as _)
+			if Perbill::from_rational_approximation(signatures.len() as u32, authorities.len() as _)
 				>= T::SignThreshold::get()
 			{
 				// TODO: clean the mmr root which was contains in this mmr root?

frame/bridge/relay-authorities/src/mock.rs

@@ -69,7 +69,7 @@ pub struct Test;
 pub struct DarwiniaMMR;
 impl MMR<BlockNumber, H256> for DarwiniaMMR {
 	fn get_root(_: BlockNumber) -> Option<H256> {
-		unimplemented!()
+		Some(Default::default())
 	}
 }
 pub struct Sign;

frame/bridge/relay-authorities/src/test.rs

@@ -191,6 +191,46 @@ fn encode_message_should_work() {
 	println!("{:?}", message);
 }
 
+#[test]
+fn mmr_root_signed_event_should_work() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(1);
+
+		assert_ok!(request_authority(1));
+		assert_ok!(RelayAuthorities::add_authority(Origin::root(), 1));
+		assert_ok!(RelayAuthorities::submit_signed_authorities(
+			Origin::signed(9),
+			[0; 65]
+		));
+
+		RelayAuthorities::finish_authorities_change();
+		events();
+
+		RelayAuthorities::new_mmr_to_sign(10);
+		events();
+
+		assert_ok!(RelayAuthorities::submit_signed_mmr_root(
+			Origin::signed(9),
+			10,
+			[0; 65],
+		));
+		assert!(relay_authorities_events().is_empty());
+		assert_ok!(RelayAuthorities::submit_signed_mmr_root(
+			Origin::signed(1),
+			10,
+			[0; 65],
+		));
+		assert_eq!(
+			relay_authorities_events(),
+			vec![Event::relay_authorities(RawEvent::MMRRootSigned(
+				10,
+				Default::default(),
+				vec![(9, [0; 65]), (1, [0; 65])]
+			))]
+		);
+	});
+}
+
 #[test]
 fn authorities_set_signed_event_should_work() {
 	new_test_ext().execute_with(|| {