The crate rename (#4223)

* Adding script for rename, could be applicable for nodes on top of it, too

* add stderr and gitlab ci features

* apply script

* fix now minor details in expected stderr

* Update the Cargo.lock

* fix name: sc-transaction -> sc-tracing

* fix rename in script, too
This commit is contained in:
Benjamin Kampmann
2019-12-02 11:23:53 +01:00
committed by GitHub
parent 40f6d05a4c
commit 927e13c13a
468 changed files with 3383 additions and 3271 deletions
+11 -11
View File
@@ -1,5 +1,5 @@
[package]
name = "substrate-cli"
name = "sc-cli"
version = "2.0.0"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Substrate CLI interface."
@@ -21,20 +21,20 @@ futures = { version = "0.3.1", features = ["compat"] }
futures01 = "0.1.29"
fdlimit = "0.1.1"
serde_json = "1.0.41"
panic-handler = { package = "substrate-panic-handler", path = "../../primitives/panic-handler" }
client-api = { package = "substrate-client-api", path = "../api" }
panic-handler = { package = "sp-panic-handler", path = "../../primitives/panic-handler" }
client-api = { package = "sc-client-api", path = "../api" }
sp-blockchain = { path = "../../primitives/blockchain" }
network = { package = "substrate-network", path = "../network" }
sr-primitives = { path = "../../primitives/sr-primitives" }
primitives = { package = "substrate-primitives", path = "../../primitives/core" }
service = { package = "substrate-service", path = "../service", default-features = false }
state-machine = { package = "substrate-state-machine", path = "../../primitives/state-machine" }
substrate-telemetry = { path = "../telemetry" }
keyring = { package = "substrate-keyring", path = "../../primitives/keyring" }
network = { package = "sc-network", path = "../network" }
sp-runtime = { path = "../../primitives/sr-primitives" }
primitives = { package = "sp-core", path = "../../primitives/core" }
service = { package = "sc-service", path = "../service", default-features = false }
state-machine = { package = "sp-state-machine", path = "../../primitives/state-machine" }
sc-telemetry = { path = "../telemetry" }
keyring = { package = "sp-keyring", path = "../../primitives/keyring" }
names = "0.11.0"
structopt = "0.3.3"
rpassword = "4.0.1"
substrate-tracing = { package = "substrate-tracing", path = "../tracing" }
sc-tracing = { package = "sc-tracing", path = "../tracing" }
[dev-dependencies]
tempfile = "3.1.0"
+1 -1
View File
@@ -19,7 +19,7 @@
use client_api::BlockchainEvents;
use futures::{StreamExt, TryStreamExt, FutureExt, future, compat::Stream01CompatExt};
use log::{info, warn};
use sr_primitives::traits::Header;
use sp_runtime::traits::Header;
use service::AbstractService;
use std::time::Duration;
@@ -18,7 +18,7 @@ use ansi_term::Colour;
use client_api::ClientInfo;
use log::info;
use network::SyncState;
use sr_primitives::traits::{Block as BlockT, CheckedDiv, NumberFor, Zero, Saturating};
use sp_runtime::traits::{Block as BlockT, CheckedDiv, NumberFor, Zero, Saturating};
use service::NetworkStatus;
use std::{convert::{TryFrom, TryInto}, fmt, time};
+5 -5
View File
@@ -63,9 +63,9 @@ use log::info;
use lazy_static::lazy_static;
use futures::{Future, FutureExt, TryFutureExt};
use futures01::{Async, Future as _};
use substrate_telemetry::TelemetryEndpoints;
use sr_primitives::generic::BlockId;
use sr_primitives::traits::Block as BlockT;
use sc_telemetry::TelemetryEndpoints;
use sp_runtime::generic::BlockId;
use sp_runtime::traits::Block as BlockT;
/// default sub directory to store network config
const DEFAULT_NETWORK_CONFIG_PATH : &'static str = "network";
@@ -970,8 +970,8 @@ fn init_logger(pattern: &str) {
builder.filter(Some("ws"), log::LevelFilter::Off);
builder.filter(Some("hyper"), log::LevelFilter::Warn);
builder.filter(Some("cranelift_wasm"), log::LevelFilter::Warn);
// Always log the special target `substrate_tracing`, overrides global level
builder.filter(Some("substrate_tracing"), log::LevelFilter::Info);
// Always log the special target `sc_tracing`, overrides global level
builder.filter(Some("sc_tracing"), log::LevelFilter::Info);
// Enable info for others.
builder.filter(None, log::LevelFilter::Info);
+5 -5
View File
@@ -311,12 +311,12 @@ arg_enum! {
}
}
impl Into<substrate_tracing::TracingReceiver> for TracingReceiver {
fn into(self) -> substrate_tracing::TracingReceiver {
impl Into<sc_tracing::TracingReceiver> for TracingReceiver {
fn into(self) -> sc_tracing::TracingReceiver {
match self {
TracingReceiver::Log => substrate_tracing::TracingReceiver::Log,
TracingReceiver::Telemetry => substrate_tracing::TracingReceiver::Telemetry,
TracingReceiver::Grafana => substrate_tracing::TracingReceiver::Grafana,
TracingReceiver::Log => sc_tracing::TracingReceiver::Log,
TracingReceiver::Telemetry => sc_tracing::TracingReceiver::Telemetry,
TracingReceiver::Grafana => sc_tracing::TracingReceiver::Grafana,
}
}
}