pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-25 07:05:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix frame_system renaming in contruct_runtime (#4412)

Browse Source 
* Fix contruct_runtime

* Update lib.rs

* Update event.rs

* Update event.rs

* Update event.rs

* Update event.rs

* Update event.rs

* Update event.rs

* Update event.rs

Back to where we started

* Update chain_spec.rs

* Update genesis.rs

* Fix it properly
This commit is contained in:
Bastian Köcher
2019-12-17 10:54:50 +01:00
committed by GitHub
parent cd718cd77d
commit e19f5adfb7
4 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/bin/node/cli/src/chain_spec.rs
+1 -1
View File
@@ -225,7 +225,7 @@ pub fn testnet_genesis(
const STASH: Balance = 100 * DOLLARS; const STASH: Balance = 100 * DOLLARS;
GenesisConfig { GenesisConfig {
system: Some(SystemConfig { frame_system: Some(SystemConfig {
code: WASM_BINARY.to_vec(), code: WASM_BINARY.to_vec(),
changes_trie_config: Default::default(), changes_trie_config: Default::default(),
}), }),
substrate/bin/node/runtime/src/lib.rs
+1 -2
View File
@@ -507,14 +507,13 @@ impl frame_system::offchain::CreateTransaction<Runtime, UncheckedExtrinsic> for
} }
} }
use frame_system as system;
construct_runtime!( construct_runtime!(
pub enum Runtime where pub enum Runtime where
Block = Block, Block = Block,
NodeBlock = node_primitives::Block, NodeBlock = node_primitives::Block,
UncheckedExtrinsic = UncheckedExtrinsic UncheckedExtrinsic = UncheckedExtrinsic
{ {
System: system::{Module, Call, Storage, Config, Event}, System: frame_system::{Module, Call, Storage, Config, Event},
Utility: pallet_utility::{Module, Call, Event}, Utility: pallet_utility::{Module, Call, Event},
Babe: pallet_babe::{Module, Call, Storage, Config, Inherent(Timestamp)}, Babe: pallet_babe::{Module, Call, Storage, Config, Inherent(Timestamp)},
Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent}, Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
substrate/bin/node/testing/src/genesis.rs
+1 -1
View File
@@ -30,7 +30,7 @@ use sp_runtime::Perbill;
/// Create genesis runtime configuration for tests. /// Create genesis runtime configuration for tests.
pub fn config(support_changes_trie: bool, code: Option<&[u8]>) -> GenesisConfig { pub fn config(support_changes_trie: bool, code: Option<&[u8]>) -> GenesisConfig {
GenesisConfig { GenesisConfig {
system: Some(SystemConfig { frame_system: Some(SystemConfig {
changes_trie_config: if support_changes_trie { Some(ChangesTrieConfiguration { changes_trie_config: if support_changes_trie { Some(ChangesTrieConfiguration {
digest_interval: 2, digest_interval: 2,
digest_levels: 2, digest_levels: 2,
substrate/frame/support/src/event.rs
+20 -13
View File
@@ -543,21 +543,28 @@ macro_rules! __impl_outer_event_json_metadata {
} }
} }
#[allow(dead_code)] $crate::__impl_outer_event_json_metadata! {
pub fn __module_events_system() -> &'static [$crate::event::EventMetadata] { @DECL_MODULE_EVENT_FNS
system::Event::metadata() $system <> ;
$( $module_name < $( $generic_params ),* > $( $instance )? ; )*
} }
}
};
$crate::paste::item! { (@DECL_MODULE_EVENT_FNS
$( $(
#[allow(dead_code)] $module_name:ident < $( $generic_params:path ),* > $( $instance:ident )? ;
pub fn [< __module_events_ $module_name $( _ $instance )? >] () -> )*
&'static [$crate::event::EventMetadata] ) => {
{ $crate::paste::item! {
$module_name::Event ::< $( $generic_params ),* > ::metadata() $(
} #[allow(dead_code)]
)* pub fn [< __module_events_ $module_name $( _ $instance )? >] () ->
} &'static [$crate::event::EventMetadata]
{
$module_name::Event ::< $( $generic_params ),* > ::metadata()
}
)*
} }
} }
} }