Update polkadot to the latest master (#251)

* update cumulus to latest polkadot

* s/Trait/Config

To be more consistent with the new naming.

* Update Cargo.lock

* fix network tests
This commit is contained in:
Sergei Shulepov
2020-12-01 19:21:40 +01:00
committed by GitHub
parent c0d80a7c95
commit f27b7acb8f
10 changed files with 359 additions and 326 deletions
@@ -23,20 +23,20 @@ use frame_support::{decl_module, decl_storage, traits::Get};
use cumulus_primitives::ParaId;
/// Configuration trait of this pallet.
pub trait Trait: frame_system::Trait {}
pub trait Config: frame_system::Config {}
impl<T: Trait> Get<ParaId> for Module<T> {
impl<T: Config> Get<ParaId> for Module<T> {
fn get() -> ParaId {
Self::parachain_id()
}
}
decl_storage! {
trait Store for Module<T: Trait> as ParachainUpgrade {
trait Store for Module<T: Config> as ParachainUpgrade {
ParachainId get(fn parachain_id) config(): ParaId = 100.into();
}
}
decl_module! {
pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
pub struct Module<T: Config> for enum Call where origin: T::Origin {}
}