Make Test Helpers no_std Compatible (#823)

* Use `sp-application-crypto` when generating test justifications

* Try to justifications tests compiling

* Try using `ed25519_dalek` for justification creation

* Small cleanup

* Correctly generate a Keypair

The public key didn't correspond to what would be derived
with the given private key.

* Remove enum index hack

* Clean up test account helper functions

* Fix tests in `pallet-finality-verifier`

* Get `pallet-substrate-bridge` tests compiling again

* Use the correct keyring in justification tests

* Clean up Keyring related code a bit

* Appease Clippy

* Remove unused import

* Use keyring variants directly

* Remove unecessary From implementation

bridges/modules/finality-verifier/src/lib.rs

@@ -521,7 +521,10 @@ pub fn initialize_for_benchmarks<T: Config<I>, I: 'static>(header: BridgedHeader
 mod tests {
 	use super::*;
 	use crate::mock::{run_test, test_header, Origin, TestHash, TestHeader, TestNumber, TestRuntime};
-	use bp_test_utils::{alice, authority_list, bob, make_justification_for_header};
+	use bp_test_utils::{
+		authority_list, keyring, make_justification_for_header,
+		Keyring::{Alice, Bob},
+	};
 	use codec::Encode;
 	use frame_support::weights::PostDispatchInfo;
 	use frame_support::{assert_err, assert_noop, assert_ok};
@@ -551,7 +554,7 @@ mod tests {
 
 		let set_id = 1;
 		let grandpa_round = 1;
-		let justification = make_justification_for_header(&header, grandpa_round, set_id, &authority_list()).encode();
+		let justification = make_justification_for_header(&header, grandpa_round, set_id, &keyring()).encode();
 
 		Module::<TestRuntime>::submit_finality_proof(Origin::signed(1), header, justification)
 	}
@@ -566,7 +569,7 @@ mod tests {
 
 	fn change_log(delay: u64) -> Digest<TestHash> {
 		let consensus_log = ConsensusLog::<TestNumber>::ScheduledChange(sp_finality_grandpa::ScheduledChange {
-			next_authorities: vec![(alice(), 1), (bob(), 1)],
+			next_authorities: vec![(Alice.into(), 1), (Bob.into(), 1)],
 			delay,
 		});
 
@@ -579,7 +582,7 @@ mod tests {
 		let consensus_log = ConsensusLog::<TestNumber>::ForcedChange(
 			delay,
 			sp_finality_grandpa::ScheduledChange {
-				next_authorities: vec![(alice(), 1), (bob(), 1)],
+				next_authorities: vec![(Alice.into(), 1), (Bob.into(), 1)],
 				delay,
 			},
 		);
@@ -725,8 +728,7 @@ mod tests {
 
 			let set_id = 2;
 			let grandpa_round = 1;
-			let justification =
-				make_justification_for_header(&header, grandpa_round, set_id, &authority_list()).encode();
+			let justification = make_justification_for_header(&header, grandpa_round, set_id, &keyring()).encode();
 
 			assert_err!(
 				Module::<TestRuntime>::submit_finality_proof(Origin::signed(1), header, justification,),
@@ -753,11 +755,9 @@ mod tests {
 	#[test]
 	fn disallows_invalid_authority_set() {
 		run_test(|| {
-			use bp_test_utils::{alice, bob};
-
 			let genesis = test_header(0);
 
-			let invalid_authority_list = vec![(alice(), u64::MAX), (bob(), u64::MAX)];
+			let invalid_authority_list = vec![(Alice.into(), u64::MAX), (Bob.into(), u64::MAX)];
 			let init_data = InitializationData {
 				header: genesis,
 				authority_list: invalid_authority_list,
@@ -794,7 +794,7 @@ mod tests {
 			initialize_substrate_bridge();
 
 			let next_set_id = 2;
-			let next_authorities = vec![(alice(), 1), (bob(), 1)];
+			let next_authorities = vec![(Alice.into(), 1), (Bob.into(), 1)];
 
 			// Need to update the header digest to indicate that our header signals an authority set
 			// change. The change will be enacted when we import our header.
@@ -804,8 +804,7 @@ mod tests {
 			// Create a valid justification for the header
 			let set_id = 1;
 			let grandpa_round = 1;
-			let justification =
-				make_justification_for_header(&header, grandpa_round, set_id, &authority_list()).encode();
+			let justification = make_justification_for_header(&header, grandpa_round, set_id, &keyring()).encode();
 
 			// Let's import our test header
 			assert_ok!(Module::<TestRuntime>::submit_finality_proof(
@@ -839,8 +838,7 @@ mod tests {
 			// Create a valid justification for the header
 			let set_id = 1;
 			let grandpa_round = 1;
-			let justification =
-				make_justification_for_header(&header, grandpa_round, set_id, &authority_list()).encode();
+			let justification = make_justification_for_header(&header, grandpa_round, set_id, &keyring()).encode();
 
 			// Should not be allowed to import this header
 			assert_err!(
@@ -863,8 +861,7 @@ mod tests {
 			// Create a valid justification for the header
 			let set_id = 1;
 			let grandpa_round = 1;
-			let justification =
-				make_justification_for_header(&header, grandpa_round, set_id, &authority_list()).encode();
+			let justification = make_justification_for_header(&header, grandpa_round, set_id, &keyring()).encode();
 
 			// Should not be allowed to import this header
 			assert_err!(

bridges/modules/substrate/src/fork_tests.rs

@@ -59,7 +59,10 @@ use crate::storage::ImportedHeader;
 use crate::verifier::*;
 use crate::{BestFinalized, BestHeight, BridgeStorage, NextScheduledChange, PalletStorage};
 use bp_header_chain::AuthoritySet;
-use bp_test_utils::{alice, authority_list, bob, make_justification_for_header};
+use bp_test_utils::{
+	authority_list, keyring, make_justification_for_header,
+	Keyring::{Alice, Bob},
+};
 use codec::Encode;
 use frame_support::{IterableStorageMap, StorageValue};
 use sp_finality_grandpa::{ConsensusLog, GRANDPA_ENGINE_ID};
@@ -456,8 +459,7 @@ where
 				// See for more: https://github.com/paritytech/parity-bridges-common/issues/430
 				let grandpa_round = 1;
 				let set_id = 1;
-				let authorities = authority_list();
-				let justification = make_justification_for_header(header, grandpa_round, set_id, &authorities).encode();
+				let justification = make_justification_for_header(header, grandpa_round, set_id, &keyring()).encode();
 
 				let res = verifier
 					.import_finality_proof(header.hash(), justification.into())
@@ -505,7 +507,7 @@ where
 
 pub(crate) fn change_log(delay: u64) -> Digest<TestHash> {
 	let consensus_log = ConsensusLog::<TestNumber>::ScheduledChange(sp_finality_grandpa::ScheduledChange {
-		next_authorities: vec![(alice(), 1), (bob(), 1)],
+		next_authorities: vec![(Alice.into(), 1), (Bob.into(), 1)],
 		delay,
 	});
 

bridges/modules/substrate/src/lib.rs

@@ -721,7 +721,10 @@ mod tests {
 	use super::*;
 	use crate::mock::{run_test, test_header, unfinalized_header, Origin, TestHeader, TestRuntime};
 	use bp_header_chain::HeaderChain;
-	use bp_test_utils::{alice, authority_list, bob};
+	use bp_test_utils::{
+		authority_list,
+		Keyring::{Alice, Bob},
+	};
 	use frame_support::{assert_err, assert_noop, assert_ok};
 	use sp_runtime::DispatchError;
 
@@ -949,7 +952,7 @@ mod tests {
 			let storage = PalletStorage::<TestRuntime>::new();
 
 			let next_set_id = 2;
-			let next_authorities = vec![(alice(), 1), (bob(), 1)];
+			let next_authorities = vec![(Alice.into(), 1), (Bob.into(), 1)];
 
 			// Need to update the header digest to indicate that our header signals an authority set
 			// change. The change will be enacted when we import our header.
@@ -978,7 +981,7 @@ mod tests {
 			let storage = PalletStorage::<TestRuntime>::new();
 
 			let next_set_id = 2;
-			let next_authorities = vec![(alice(), 1), (bob(), 1)];
+			let next_authorities = vec![(Alice.into(), 1), (Bob.into(), 1)];
 
 			// Need to update the header digest to indicate that our header signals an authority set
 			// change. However, the change doesn't happen until the next block.
@@ -1007,7 +1010,7 @@ mod tests {
 		run_test(|| {
 			let storage = PalletStorage::<TestRuntime>::new();
 
-			let next_authorities = vec![(alice(), 1)];
+			let next_authorities = vec![(Alice.into(), 1)];
 			let next_set_id = 2;
 			let next_authority_set = AuthoritySet::new(next_authorities.clone(), next_set_id);
 

bridges/modules/substrate/src/verifier.rs

@@ -342,7 +342,10 @@ mod tests {
 	use super::*;
 	use crate::mock::*;
 	use crate::{BestFinalized, BestHeight, HeaderId, ImportedHeaders, PalletStorage};
-	use bp_test_utils::{alice, authority_list, bob, make_justification_for_header};
+	use bp_test_utils::{
+		authority_list, keyring, make_justification_for_header,
+		Keyring::{Alice, Bob},
+	};
 	use codec::Encode;
 	use frame_support::{assert_err, assert_ok};
 	use frame_support::{StorageMap, StorageValue};
@@ -587,7 +590,7 @@ mod tests {
 
 			let set_id = 1;
 			let authorities = authority_list();
-			let initial_authority_set = AuthoritySet::new(authorities.clone(), set_id);
+			let initial_authority_set = AuthoritySet::new(authorities, set_id);
 			storage.update_current_authority_set(initial_authority_set);
 
 			// Let's import our header
@@ -603,7 +606,7 @@ mod tests {
 
 			// Now lets finalize our best header
 			let grandpa_round = 1;
-			let justification = make_justification_for_header(&header, grandpa_round, set_id, &authorities).encode();
+			let justification = make_justification_for_header(&header, grandpa_round, set_id, &keyring()).encode();
 			assert_ok!(verifier.import_finality_proof(header.hash(), justification.into()));
 
 			// Our best header should only appear once in the list of best headers
@@ -693,7 +696,7 @@ mod tests {
 			// This is an *invalid* authority set because the combined weight of the
 			// authorities is greater than `u64::MAX`
 			let consensus_log = ConsensusLog::<TestNumber>::ScheduledChange(sp_finality_grandpa::ScheduledChange {
-				next_authorities: vec![(alice(), u64::MAX), (bob(), u64::MAX)],
+				next_authorities: vec![(Alice.into(), u64::MAX), (Bob.into(), u64::MAX)],
 				delay: 0,
 			});
 
@@ -722,12 +725,12 @@ mod tests {
 
 			let set_id = 1;
 			let authorities = authority_list();
-			let authority_set = AuthoritySet::new(authorities.clone(), set_id);
+			let authority_set = AuthoritySet::new(authorities, set_id);
 			storage.update_current_authority_set(authority_set);
 
 			// We'll need this justification to finalize the header
 			let grandpa_round = 1;
-			let justification = make_justification_for_header(&header, grandpa_round, set_id, &authorities).encode();
+			let justification = make_justification_for_header(&header, grandpa_round, set_id, &keyring()).encode();
 
 			let mut verifier = Verifier {
 				storage: storage.clone(),
@@ -748,14 +751,11 @@ mod tests {
 
 			let set_id = 1;
 			let authorities = authority_list();
-			let authority_set = AuthoritySet {
-				authorities: authorities.clone(),
-				set_id,
-			};
+			let authority_set = AuthoritySet { authorities, set_id };
 			storage.update_current_authority_set(authority_set);
 
 			let grandpa_round = 1;
-			let justification = make_justification_for_header(&header, grandpa_round, set_id, &authorities).encode();
+			let justification = make_justification_for_header(&header, grandpa_round, set_id, &keyring()).encode();
 
 			let mut verifier = Verifier {
 				storage: storage.clone(),
@@ -792,19 +792,19 @@ mod tests {
 
 			let set_id = 1;
 			let authorities = authority_list();
-			let initial_authority_set = AuthoritySet::new(authorities.clone(), set_id);
+			let initial_authority_set = AuthoritySet::new(authorities, set_id);
 			storage.update_current_authority_set(initial_authority_set);
 
 			// This header enacts an authority set change upon finalization
 			let header = test_header(2);
 
 			let grandpa_round = 1;
-			let justification = make_justification_for_header(&header, grandpa_round, set_id, &authorities).encode();
+			let justification = make_justification_for_header(&header, grandpa_round, set_id, &keyring()).encode();
 
 			// Schedule a change at the height of our header
 			let set_id = 2;
 			let height = *header.number();
-			let authorities = vec![alice()];
+			let authorities = vec![Alice.into()];
 			let change = schedule_next_change(authorities, set_id, height);
 			storage.schedule_next_set_change(genesis_hash, change.clone());