pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-30 23:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest master (#137)

Browse Source
This commit is contained in:
Gav Wood
2019-02-13 15:36:54 +01:00
committed by GitHub
parent cdb2faf155
commit 91c7abd7dc
7 changed files with 417 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/runtime/src/lib.rs
+3
View File
@@ -188,11 +188,13 @@ impl session::Trait for Runtime {
}
impl staking::Trait for Runtime {
type Currency = Balances;
type OnRewardMinted = Treasury;
type Event = Event;
}
impl democracy::Trait for Runtime {
type Currency = Balances;
type Proposal = Call;
type Event = Event;
}
@@ -212,6 +214,7 @@ impl council::motions::Trait for Runtime {
}
impl treasury::Trait for Runtime {
type Currency = Balances;
type ApproveOrigin = council_motions::EnsureMembers<_4>;
type RejectOrigin = council_motions::EnsureMembers<_2>;
type Event = Event;
polkadot/runtime/src/parachains.rs
+2 -2
View File
@@ -30,7 +30,7 @@ use srml_support::dispatch::Result;
use inherents::{ProvideInherent, InherentData, RuntimeString, MakeFatalError, InherentIdentifier};
#[cfg(any(feature = "std", test))]
use sr_primitives::{self, ChildrenStorageMap};
use sr_primitives::{StorageOverlay, ChildrenStorageOverlay};
#[cfg(any(feature = "std", test))]
use rstd::marker::PhantomData;
@@ -54,7 +54,7 @@ decl_storage! {
add_extra_genesis {
config(parachains): Vec<(ParaId, Vec<u8>, Vec<u8>)>;
config(_phdata): PhantomData<T>;
build(|storage: &mut sr_primitives::StorageMap, _: &mut ChildrenStorageMap, config: &GenesisConfig<T>| {
build(|storage: &mut StorageOverlay, _: &mut ChildrenStorageOverlay, config: &GenesisConfig<T>| {
use codec::Encode;
let mut p = config.parachains.clone();