Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
Binary file not shown.
2 changes: 1 addition & 1 deletion node/executor/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ mod tests {
use substrate_executor::{WasmExecutor, NativeExecutionDispatch};
use parity_codec::{Encode, Decode, Joiner};
use keyring::Keyring;
use runtime_support::{Hashable, StorageValue, StorageMap};
use runtime_support::{Hashable, StorageValue, StorageMap, traits::Funding};
use state_machine::{CodeExecutor, Externalities, TestExternalities};
use primitives::{
twox_128, Blake2Hasher, ChangesTrieConfiguration, ed25519::{Public, Pair}, NeverNativeValue
Expand Down
7 changes: 5 additions & 2 deletions node/runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("node"),
impl_name: create_runtime_str!("substrate-node"),
authoring_version: 10,
spec_version: 23,
impl_version: 23,
spec_version: 24,
impl_version: 24,
apis: RUNTIME_API_VERSIONS,
};

Expand Down Expand Up @@ -141,11 +141,13 @@ impl session::Trait for Runtime {
}

impl staking::Trait for Runtime {
type Funding = balances::Module<Self>;
type OnRewardMinted = Treasury;
type Event = Event;
}

impl democracy::Trait for Runtime {
type Funding = balances::Module<Self>;
type Proposal = Call;
type Event = Event;
}
Expand All @@ -165,6 +167,7 @@ impl council::motions::Trait for Runtime {
}

impl treasury::Trait for Runtime {
type Funding = balances::Module<Self>;
type ApproveOrigin = council_motions::EnsureMembers<_4>;
type RejectOrigin = council_motions::EnsureMembers<_2>;
type Event = Event;
Expand Down
Binary file not shown.
Loading