Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Make tests work after the changes introduced in #3793 #3874

Merged
HCastano merged 2 commits into from
Oct 23, 2019
Merged

Make tests work after the changes introduced in #3793 #3874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05a5292
Make tests work after the changes introduced in #3793
HCastano Oct 22, 2019
8a9eb3b
Remove unneccessary import
HCastano Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions srml/bridge/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,11 @@ impl<T: Trait> Module<T> {
mod tests {
use super::*;

use primitives::{H256, Blake2Hasher};
use primitives::H256;
use sr_primitives::{
Perbill, traits::{Header as HeaderT, IdentityLookup}, testing::Header, generic::Digest,
};
use support::{assert_ok, impl_outer_origin, parameter_types};
use runtime_io::with_externalities;

// NOTE: What's this for?
impl_outer_origin! {
Expand Down Expand Up @@ -188,7 +187,6 @@ mod tests {
type AccountId = DummyValidatorId;
type Lookup = IdentityLookup<Self::AccountId>;
type Header = Header;
type WeightMultiplierUpdate = ();
type Event = ();
type BlockHashCount = ();
type MaximumBlockWeight = ();
Expand All @@ -201,7 +199,7 @@ mod tests {
type ValidatorId = DummyValidatorId;
}

fn new_test_ext() -> runtime_io::TestExternalities<Blake2Hasher> {
fn new_test_ext() -> runtime_io::TestExternalities {
let mut t = system::GenesisConfig::default().build_storage::<Test>().unwrap();
GenesisConfig {
num_bridges: 0,
Expand All @@ -211,7 +209,7 @@ mod tests {

#[test]
fn it_works_for_default_value() {
with_externalities(&mut new_test_ext(), || {
new_test_ext().execute_with(|| {
assert_eq!(MockBridge::num_bridges(), 0);
});
}
Expand All @@ -228,7 +226,7 @@ mod tests {
};
let test_hash = test_header.hash();

with_externalities(&mut new_test_ext(), || {
new_test_ext().execute_with(|| {
assert_eq!(MockBridge::num_bridges(), 0);
assert_eq!(MockBridge::tracked_bridges(0), None);

Expand Down