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

Authority_discovery: expose assimilate_storage with GenesisBuild #9279

Merged
merged 2 commits into from
Jul 5, 2021
Merged

Authority_discovery: expose assimilate_storage with GenesisBuild #9279

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6c4227
use genesis build
ferrell-code Jul 5, 2021
95c6e4e
format
ferrell-code Jul 5, 2021
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
24 changes: 6 additions & 18 deletions frame/authority-discovery/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@

use sp_std::prelude::*;
use frame_support::traits::OneSessionHandler;
#[cfg(feature = "std")]
use frame_support::traits::GenesisBuild;
use sp_authority_discovery::AuthorityId;

pub use pallet::*;
Expand Down Expand Up @@ -148,17 +146,6 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
}
}

#[cfg(feature = "std")]
impl GenesisConfig {
/// Direct implementation of `GenesisBuild::assimilate_storage`.
pub fn assimilate_storage<T: Config>(
&self,
storage: &mut sp_runtime::Storage
) -> Result<(), String> {
<Self as GenesisBuild<T>>::assimilate_storage(self, storage)
}
}

#[cfg(test)]
mod tests {
use crate as pallet_authority_discovery;
Expand All @@ -172,6 +159,7 @@ mod tests {
Perbill, KeyTypeId,
};
use frame_support::parameter_types;
use frame_support::traits::GenesisBuild;

type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
type Block = frame_system::mocking::MockBlock<Test>;
Expand Down Expand Up @@ -302,11 +290,11 @@ mod tests {
.build_storage::<Test>()
.unwrap();

pallet_authority_discovery::GenesisConfig {
keys: vec![],
}
.assimilate_storage::<Test>(&mut t)
.unwrap();

GenesisBuild::<Test>::assimilate_storage(
&pallet_authority_discovery::GenesisConfig{keys: vec![]},
&mut t
).unwrap();

// Create externalities.
let mut externalities = TestExternalities::new(t);
Expand Down