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

Fix issues related to Rust 2018, Macros, and node-template (#1742)

Browse Source 
* Initial fix, need to remove demo

* Fix similar issue with contracts module

* Remove Demo Module for Testing

* Undo changes to Contracts module
This commit is contained in:
Shawn Tabrizi
2019-02-08 14:31:05 +01:00
committed by Gav Wood
parent 0135afd0ed
commit 7b0f82b4f0
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/node-template/runtime/Cargo.toml
+2 -2
View File
@@ -13,7 +13,7 @@ parity-codec-derive = { version = "3.0", default-features = false }
rstd = { package = "sr-std", path = "../../core/sr-std", default_features = false } rstd = { package = "sr-std", path = "../../core/sr-std", default_features = false }
runtime-io = { package = "sr-io", path = "../../core/sr-io", default_features = false } runtime-io = { package = "sr-io", path = "../../core/sr-io", default_features = false }
version = { package = "sr-version", path = "../../core/sr-version", default_features = false } version = { package = "sr-version", path = "../../core/sr-version", default_features = false }
support = { package = "srml-support", path = "../../srml/support", default_features = false } srml-support = { path = "../../srml/support", default_features = false }
primitives = { package = "substrate-primitives", path = "../../core/primitives", default_features = false } primitives = { package = "substrate-primitives", path = "../../core/primitives", default_features = false }
balances = { package = "srml-balances", path = "../../srml/balances", default_features = false } balances = { package = "srml-balances", path = "../../srml/balances", default_features = false }
consensus = { package = "srml-consensus", path = "../../srml/consensus", default_features = false } consensus = { package = "srml-consensus", path = "../../srml/consensus", default_features = false }
@@ -36,7 +36,7 @@ std = [
"substrate-client/std", "substrate-client/std",
"rstd/std", "rstd/std",
"runtime-io/std", "runtime-io/std",
"support/std", "srml-support/std",
"balances/std", "balances/std",
"executive/std", "executive/std",
"aura/std", "aura/std",
substrate/node-template/runtime/src/lib.rs
+1 -1
View File
@@ -38,7 +38,7 @@ pub use timestamp::Call as TimestampCall;
pub use balances::Call as BalancesCall; pub use balances::Call as BalancesCall;
pub use runtime_primitives::{Permill, Perbill}; pub use runtime_primitives::{Permill, Perbill};
pub use timestamp::BlockPeriod; pub use timestamp::BlockPeriod;
pub use support::{StorageValue, construct_runtime}; pub use srml_support::{StorageValue, construct_runtime};
/// Alias to Ed25519 pubkey that identifies an account on the chain. /// Alias to Ed25519 pubkey that identifies an account on the chain.
pub type AccountId = primitives::H256; pub type AccountId = primitives::H256;
substrate/srml/support/src/dispatch.rs
+1 -1
View File
@@ -732,7 +732,7 @@ macro_rules! decl_module {
d.dispatch(origin) d.dispatch(origin)
} }
} }
__dispatch_impl_metadata! { $crate::__dispatch_impl_metadata! {
$mod_type $trait_instance $trait_name $call_type $origin_type $mod_type $trait_instance $trait_name $call_type $origin_type
{$( $(#[doc = $doc_attr])* fn $fn_name($from $(, $(#[$codec_attr])* $param_name : $param )*); )*} {$( $(#[doc = $doc_attr])* fn $fn_name($from $(, $(#[$codec_attr])* $param_name : $param )*); )*}
} }
substrate/srml/support/src/event.rs
+5 -5
View File
@@ -147,7 +147,7 @@ macro_rules! __decl_generic_event {
$(, $( $rest_gen_rename:ident = )* <$rest_gen:ident as $rest_trait:path>::$rest_trait_type:ident )*; $(, $( $rest_gen_rename:ident = )* <$rest_gen:ident as $rest_trait:path>::$rest_trait_type:ident )*;
Events { $( $events:tt )* }; Events { $( $events:tt )* };
) => { ) => {
__decl_generic_event!( $crate::__decl_generic_event!(
$( #[ $attr ] )*; $( #[ $attr ] )*;
$event_generic_param; $event_generic_param;
$( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*; $( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*;
@@ -165,7 +165,7 @@ macro_rules! __decl_generic_event {
$( $parsed_generic_params:ident ),*; $( $parsed_generic_params:ident ),*;
$( <$parsed_generic:ident as $parsed_trait:path>::$parsed_trait_type:ident ),*; $( <$parsed_generic:ident as $parsed_trait:path>::$parsed_trait_type:ident ),*;
) => { ) => {
__decl_generic_event!( $crate::__decl_generic_event!(
$( #[ $attr ] )*; $( #[ $attr ] )*;
$event_generic_param; $event_generic_param;
$( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*; $( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*;
@@ -181,7 +181,7 @@ macro_rules! __decl_generic_event {
$(, $( $rest_gen_rename:ident = )* <$rest_gen:ident as $rest_trait:path>::$rest_trait_type:ident )*; $(, $( $rest_gen_rename:ident = )* <$rest_gen:ident as $rest_trait:path>::$rest_trait_type:ident )*;
Events { $( $events:tt )* }; Events { $( $events:tt )* };
) => { ) => {
__decl_generic_event!( $crate::__decl_generic_event!(
$( #[ $attr ] )*; $( #[ $attr ] )*;
$event_generic_param; $event_generic_param;
$( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*; $( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*;
@@ -199,7 +199,7 @@ macro_rules! __decl_generic_event {
$( $parsed_generic_params:ident ),*; $( $parsed_generic_params:ident ),*;
$( <$parsed_generic:ident as $parsed_trait:path>::$parsed_trait_type:ident ),*; $( <$parsed_generic:ident as $parsed_trait:path>::$parsed_trait_type:ident ),*;
) => { ) => {
__decl_generic_event!( $crate::__decl_generic_event!(
$( #[ $attr ] )*; $( #[ $attr ] )*;
$event_generic_param; $event_generic_param;
$( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*; $( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*;
@@ -247,7 +247,7 @@ macro_rules! __events_to_metadata {
$event:ident $( ( $( $param:path ),* ) )*, $event:ident $( ( $( $param:path ),* ) )*,
$( $rest:tt )* $( $rest:tt )*
) => { ) => {
__events_to_metadata!( $crate::__events_to_metadata!(
$( $metadata, )* $( $metadata, )*
$crate::event::EventMetadata { $crate::event::EventMetadata {
name: $crate::event::DecodeDifferent::Encode(stringify!($event)), name: $crate::event::DecodeDifferent::Encode(stringify!($event)),