Migrate basic-authorship, cli and client-db crates to 2018 edition (#1529)

This commit is contained in:
Stanislav Tkach
2019-01-23 15:27:40 +02:00
committed by Gav Wood
parent ac065a96ba
commit 28c37ef419
16 changed files with 94 additions and 142 deletions
+9 -8
View File
@@ -2,14 +2,15 @@
name = "substrate-basic-authorship"
version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
log = "0.4"
parity-codec = "2.2"
sr-primitives = { path = "../sr-primitives" }
substrate-client = { path = "../client" }
substrate-consensus-aura-primitives = { path = "../consensus/aura/primitives" }
substrate-consensus-common = { path = "../consensus/common" }
substrate-primitives = { path = "../primitives" }
substrate-inherents = { path = "../inherents" }
substrate-transaction-pool = { path = "../transaction-pool" }
codec = { package = "parity-codec", version = "2.2" }
runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives" }
client = { package = "substrate-client", path = "../../core/client" }
aura_primitives = { package = "substrate-consensus-aura-primitives", path = "../../core/consensus/aura/primitives" }
consensus_common = { package = "substrate-consensus-common", path = "../../core/consensus/common" }
primitives = { package = "substrate-primitives", path = "../../core/primitives" }
inherents = { package = "substrate-inherents", path = "../inherents" }
transaction_pool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" }
@@ -20,6 +20,8 @@
use std::{sync::Arc, self};
use log::{info, trace};
use client::{
self, error, Client as SubstrateClient, CallExecutor,
block_builder::api::BlockBuilder as BlockBuilderApi, runtime_api::{Core, ApiExt}
+1 -12
View File
@@ -18,17 +18,6 @@
#![warn(unused_extern_crates)]
extern crate substrate_primitives as primitives;
extern crate sr_primitives as runtime_primitives;
extern crate substrate_consensus_common as consensus_common;
extern crate substrate_client as client;
extern crate parity_codec as codec;
extern crate substrate_transaction_pool as transaction_pool;
extern crate substrate_inherents as inherents;
#[macro_use]
extern crate log;
mod basic_authorship;
pub use basic_authorship::{ProposerFactory, BlockBuilder, AuthoringApi, Proposer};
pub use crate::basic_authorship::{ProposerFactory, BlockBuilder, AuthoringApi, Proposer};