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
+22 -22
View File
@@ -1,5 +1,5 @@
[package]
name = "substrate-consensus-babe"
name = "sc-consensus-babe"
version = "2.0.0"
authors = ["Parity Technologies <admin@parity.io>"]
description = "BABE consensus algorithm for substrate"
@@ -7,27 +7,27 @@ edition = "2018"
[dependencies]
codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }
babe_primitives = { package = "substrate-consensus-babe-primitives", path = "../../../primitives/consensus/babe" }
primitives = { package = "substrate-primitives", path = "../../../primitives/core" }
app-crypto = { package = "substrate-application-crypto", path = "../../../primitives/application-crypto" }
babe_primitives = { package = "sp-consensus-babe", path = "../../../primitives/consensus/babe" }
primitives = { package = "sp-core", path = "../../../primitives/core" }
app-crypto = { package = "sc-application-crypto", path = "../../../primitives/application-crypto" }
num-bigint = "0.2.3"
num-rational = "0.2.2"
num-traits = "0.2.8"
runtime-version = { package = "sr-version", path = "../../../primitives/sr-version" }
runtime-io = { package = "sr-io", path = "../../../primitives/sr-io" }
inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" }
runtime-version = { package = "sp-version", path = "../../../primitives/sr-version" }
runtime-io = { package = "sp-io", path = "../../../primitives/sr-io" }
inherents = { package = "sp-inherents", path = "../../../primitives/inherents" }
sp-timestamp = { path = "../../../primitives/timestamp" }
substrate-telemetry = { path = "../../telemetry" }
keystore = { package = "substrate-keystore", path = "../../keystore" }
client-api = { package = "substrate-client-api", path = "../../api" }
client = { package = "substrate-client", path = "../../" }
sr-api = { path = "../../../primitives/sr-api" }
block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api" }
sc-telemetry = { path = "../../telemetry" }
keystore = { package = "sc-keystore", path = "../../keystore" }
client-api = { package = "sc-client-api", path = "../../api" }
client = { package = "sc-client", path = "../../" }
sp-api = { path = "../../../primitives/sr-api" }
block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder/runtime-api" }
sp-blockchain = { path = "../../../primitives/blockchain" }
consensus-common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" }
uncles = { package = "substrate-consensus-uncles", path = "../uncles" }
slots = { package = "substrate-consensus-slots", path = "../slots" }
sr-primitives = { path = "../../../primitives/sr-primitives" }
consensus-common = { package = "sp-consensus", path = "../../../primitives/consensus/common" }
uncles = { package = "sc-consensus-uncles", path = "../uncles" }
slots = { package = "sc-consensus-slots", path = "../slots" }
sp-runtime = { path = "../../../primitives/sr-primitives" }
fork-tree = { path = "../../../utils/fork-tree" }
futures = { version = "0.3.1", features = ["compat"] }
futures01 = { package = "futures", version = "0.1" }
@@ -41,12 +41,12 @@ pdqselect = "0.1.0"
derive_more = "0.99.2"
[dev-dependencies]
keyring = { package = "substrate-keyring", path = "../../../primitives/keyring" }
substrate-executor = { path = "../../executor" }
network = { package = "substrate-network", path = "../../network", features = ["test-helpers"]}
service = { package = "substrate-service", path = "../../service" }
keyring = { package = "sp-keyring", path = "../../../primitives/keyring" }
sc-executor = { path = "../../executor" }
network = { package = "sc-network", path = "../../network", features = ["test-helpers"]}
service = { package = "sc-service", path = "../../service" }
test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" }
block-builder = { package = "substrate-block-builder", path = "../../block-builder" }
block-builder = { package = "sc-block-builder", path = "../../block-builder" }
tokio = "0.1.22"
env_logger = "0.7.0"
tempfile = "3.1.0"
@@ -21,7 +21,7 @@ use codec::{Decode, Encode};
use client_api::backend::AuxStore;
use sp_blockchain::{Result as ClientResult, Error as ClientError};
use sr_primitives::traits::Block as BlockT;
use sp_runtime::traits::Block as BlockT;
use babe_primitives::BabeBlockWeight;
use super::{epoch_changes::EpochChangesFor, SharedEpochChanges};
@@ -23,7 +23,7 @@ use std::sync::Arc;
use babe_primitives::{Epoch, SlotNumber, NextEpochDescriptor};
use fork_tree::ForkTree;
use parking_lot::{Mutex, MutexGuard};
use sr_primitives::traits::{Block as BlockT, NumberFor, One, Zero};
use sp_runtime::traits::{Block as BlockT, NumberFor, One, Zero};
use codec::{Encode, Decode};
use client_api::utils::is_descendent_of;
use sp_blockchain::{HeaderMetadata, HeaderBackend, Error as ClientError};
+5 -5
View File
@@ -69,8 +69,8 @@ use consensus_common::{ImportResult, CanAuthorWith};
use consensus_common::import_queue::{
BoxJustificationImport, BoxFinalityProofImport,
};
use sr_primitives::{generic::{BlockId, OpaqueDigestItemId}, Justification};
use sr_primitives::traits::{
use sp_runtime::{generic::{BlockId, OpaqueDigestItemId}, Justification};
use sp_runtime::traits::{
Block as BlockT, Header, DigestItemFor, ProvideRuntimeApi,
Zero,
};
@@ -78,7 +78,7 @@ use keystore::KeyStorePtr;
use parking_lot::Mutex;
use primitives::{Blake2Hasher, H256, Pair};
use inherents::{InherentDataProviders, InherentData};
use substrate_telemetry::{telemetry, CONSENSUS_TRACE, CONSENSUS_DEBUG};
use sc_telemetry::{telemetry, CONSENSUS_TRACE, CONSENSUS_DEBUG};
use consensus_common::{
self, BlockImport, Environment, Proposer, BlockCheckParams,
ForkChoiceStrategy, BlockImportParams, BlockOrigin, Error as ConsensusError,
@@ -107,7 +107,7 @@ use sp_blockchain::{
};
use schnorrkel::SignatureError;
use sr_api::ApiExt;
use sp_api::ApiExt;
mod aux_schema;
mod verification;
@@ -411,7 +411,7 @@ impl<B, C, E, I, Error, SO> slots::SimpleSlotWorker<B> for BabeWorker<B, C, E, I
s
}
fn pre_digest_data(&self, _slot_number: u64, claim: &Self::Claim) -> Vec<sr_primitives::DigestItem<B::Hash>> {
fn pre_digest_data(&self, _slot_number: u64, claim: &Self::Claim) -> Vec<sp_runtime::DigestItem<B::Hash>> {
vec![
<DigestItemFor<B> as CompatibleDigestItem>::babe_pre_digest(claim.0.clone()),
]
+2 -2
View File
@@ -31,7 +31,7 @@ use consensus_common::import_queue::{
use network::test::*;
use network::test::{Block as TestBlock, PeersClient};
use network::config::BoxFinalityProofRequestBuilder;
use sr_primitives::{generic::DigestItem, traits::{Block as BlockT, DigestFor}};
use sp_runtime::{generic::DigestItem, traits::{Block as BlockT, DigestFor}};
use network::config::ProtocolConfig;
use tokio::runtime::current_thread;
use client_api::BlockchainEvents;
@@ -540,7 +540,7 @@ fn propose_and_import_block(
parent_pre_digest.slot_number() + 1
});
let pre_digest = sr_primitives::generic::Digest {
let pre_digest = sp_runtime::generic::Digest {
logs: vec![
Item::babe_pre_digest(
BabePreDigest::Secondary {
@@ -16,7 +16,7 @@
//! Verification for BABE headers.
use schnorrkel::vrf::{VRFOutput, VRFProof};
use sr_primitives::{traits::Header, traits::DigestItemFor};
use sp_runtime::{traits::Header, traits::DigestItemFor};
use primitives::{Pair, Public};
use babe_primitives::{Epoch, BabePreDigest, CompatibleDigestItem, AuthorityId};
use babe_primitives::{AuthoritySignature, SlotNumber, AuthorityIndex, AuthorityPair};