Migrate consensus (common, aura-primitives, aura, rhd) to 2018 edition (#1548)

This commit is contained in:
Stanislav Tkach
2019-01-24 17:51:33 +02:00
committed by Gav Wood
parent a5cafa68b1
commit 7f05bd959f
14 changed files with 65 additions and 136 deletions
@@ -3,24 +3,25 @@ name = "substrate-consensus-aura-primitives"
version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Primitives for Aura consensus"
edition = "2018"
[dependencies]
parity-codec = { version = "2.2", default-features = false }
substrate-client = { path = "../../../client", default-features = false }
substrate-primitives = { path = "../../../primitives", default-features = false }
srml-support = { path = "../../../../srml/support", default-features = false }
sr-primitives = { path = "../../../sr-primitives", default-features = false }
primitives = { package = "substrate-primitives", path = "../../../primitives", default-features = false }
runtime_support = { package = "srml-support", path = "../../../../srml/support", default-features = false }
runtime_primitives = { package = "sr-primitives", path = "../../../sr-primitives", default-features = false }
sr-version = { path = "../../../sr-version", default-features = false }
sr-io = { path = "../../../sr-io", default-features = false }
runtime_io = { package = "sr-io", path = "../../../sr-io", default-features = false }
[features]
default = ["std"]
std = [
"parity-codec/std",
"substrate-client/std",
"substrate-primitives/std",
"srml-support/std",
"sr-primitives/std",
"primitives/std",
"runtime_support/std",
"runtime_primitives/std",
"sr-version/std",
"sr-io/std",
"runtime_io/std",
]
@@ -18,16 +18,9 @@
#![cfg_attr(not(feature = "std"), no_std)]
extern crate parity_codec as codec;
extern crate substrate_client as client;
extern crate substrate_primitives as primitives;
extern crate srml_support as runtime_support;
extern crate sr_io as runtime_io;
extern crate sr_primitives as runtime_primitives;
/// The ApiIds for Aura authorship API.
pub mod id {
use client::runtime_api::ApiId;
use substrate_client::runtime_api::ApiId;
/// ApiId for the AuraApi trait.
pub const AURA_API: ApiId = *b"aura_api";
@@ -45,7 +38,7 @@ pub struct AuraConsensusData {
/// Runtime-APIs
pub mod api {
use client::decl_runtime_apis;
use substrate_client::decl_runtime_apis;
decl_runtime_apis! {
/// API necessary for block authorship with aura.
pub trait AuraApi {