Migrate srml crates to the 2018 edition (#1755)

This commit is contained in:
Stanislav Tkach
2019-02-11 12:42:36 +02:00
committed by Gav Wood
parent b28f7328ac
commit c860787db7
37 changed files with 220 additions and 422 deletions
+12 -12
View File
@@ -2,32 +2,32 @@
name = "srml-executive"
version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
hex-literal = "0.1.0"
serde = { version = "1.0", default-features = false }
parity-codec = { version = "3.0", default-features = false }
parity-codec-derive = { version = "3.0", default-features = false }
sr-std = { path = "../../core/sr-std", default-features = false }
sr-io = { path = "../../core/sr-io", default-features = false }
sr-primitives = { path = "../../core/sr-primitives", 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 }
primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false }
srml-support = { path = "../support", default-features = false }
srml-system = { path = "../system", default-features = false }
system = { package = "srml-system", path = "../system", default-features = false }
[dev-dependencies]
hex-literal = "0.1.0"
substrate-primitives = { path = "../../core/primitives" }
srml-indices = { path = "../indices" }
srml-balances = { path = "../balances" }
balances = { package = "srml-balances", path = "../balances" }
parity-codec-derive = { version = "3.0", default-features = false }
[features]
default = ["std"]
std = [
"sr-std/std",
"rstd/std",
"srml-support/std",
"serde/std",
"parity-codec/std",
"parity-codec-derive/std",
"sr-primitives/std",
"sr-io/std",
"srml-system/std",
"primitives/std",
"runtime_io/std",
"system/std",
]
+4 -25
View File
@@ -18,35 +18,13 @@
#![cfg_attr(not(feature = "std"), no_std)]
#[cfg(test)]
extern crate parity_codec_derive;
#[cfg_attr(test, macro_use)]
extern crate srml_support as runtime_support;
extern crate sr_std as rstd;
extern crate sr_io as runtime_io;
extern crate parity_codec as codec;
extern crate sr_primitives as primitives;
extern crate srml_system as system;
#[cfg(test)]
#[macro_use]
extern crate hex_literal;
#[cfg(test)]
extern crate substrate_primitives;
#[cfg(test)]
extern crate srml_balances as balances;
use rstd::prelude::*;
use rstd::marker::PhantomData;
use rstd::result;
use primitives::traits::{self, Header, Zero, One, Checkable, Applyable, CheckEqual, OnFinalise,
OnInitialise, MakePayment, Hash, As, Digest};
use runtime_support::Dispatchable;
use codec::{Codec, Encode};
use srml_support::Dispatchable;
use parity_codec::{Codec, Encode};
use system::extrinsics_root;
use primitives::{ApplyOutcome, ApplyError};
use primitives::transaction_validity::{TransactionValidity, TransactionPriority, TransactionLongevity};
@@ -304,8 +282,9 @@ mod tests {
use primitives::BuildStorage;
use primitives::traits::{Header as HeaderT, BlakeTwo256, IdentityLookup};
use primitives::testing::{Digest, DigestItem, Header, Block};
use runtime_support::traits::Currency;
use srml_support::{traits::Currency, impl_outer_origin, impl_outer_event};
use system;
use hex_literal::{hex, hex_impl};
impl_outer_origin! {
pub enum Origin for Runtime {