pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 17:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make Test Helpers no_std Compatible (#823)

Browse Source 
* 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
This commit is contained in:
Hernando Castano
2021-03-18 16:46:52 -04:00
committed by Bastian Köcher
parent 401d3847d1
commit eb7c96ba14
7 changed files with 128 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridges/modules/substrate/src/fork_tests.rs
+6 -4
View File
@@ -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
+7 -4
View File
@@ -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
+14 -14
View File
@@ -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());