pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 23:51:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

The crate rename (#4223)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/service/Cargo.toml
+25 -25
View File
@@ -1,5 +1,5 @@
[package]
name = "substrate-service"
name = "sc-service"
version = "2.0.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
@@ -10,7 +10,7 @@ default = ["rocksdb"]
# a path to a database, an error will be produced at runtime.
rocksdb = ["client_db/kvdb-rocksdb"]
wasmtime = [
"substrate-executor/wasmtime",
"sc-executor/wasmtime",
]
[dependencies]
@@ -28,37 +28,37 @@ serde = "1.0.101"
serde_json = "1.0.41"
sysinfo = "0.9.5"
target_info = "0.1.0"
keystore = { package = "substrate-keystore", path = "../keystore" }
sr-io = { path = "../../primitives/sr-io" }
sr-primitives = { path = "../../primitives/sr-primitives" }
keystore = { package = "sc-keystore", path = "../keystore" }
sp-io = { path = "../../primitives/sr-io" }
sp-runtime = { path = "../../primitives/sr-primitives" }
sp-blockchain = { path = "../../primitives/blockchain" }
primitives = { package = "substrate-primitives", path = "../../primitives/core" }
session = { package = "substrate-session", path = "../../primitives/session" }
app-crypto = { package = "substrate-application-crypto", path = "../../primitives/application-crypto" }
consensus_common = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" }
network = { package = "substrate-network", path = "../network" }
chain-spec = { package = "substrate-chain-spec", path = "../chain-spec" }
client-api = { package = "substrate-client-api", path = "../api" }
client = { package = "substrate-client", path = "../" }
sr-api = { path = "../../primitives/sr-api" }
primitives = { package = "sp-core", path = "../../primitives/core" }
session = { package = "sp-sesssion", path = "../../primitives/session" }
app-crypto = { package = "sc-application-crypto", path = "../../primitives/application-crypto" }
consensus_common = { package = "sp-consensus", path = "../../primitives/consensus/common" }
network = { package = "sc-network", path = "../network" }
chain-spec = { package = "sc-chain-spec", path = "../chain-spec" }
client-api = { package = "sc-client-api", path = "../api" }
client = { package = "sc-client", path = "../" }
sp-api = { path = "../../primitives/sr-api" }
txpool-runtime-api = { package = "sp-transaction-pool-runtime-api", path = "../../primitives/transaction-pool/runtime-api" }
client_db = { package = "substrate-client-db", path = "../db" }
client_db = { package = "sc-client-db", path = "../db" }
codec = { package = "parity-scale-codec", version = "1.0.0" }
substrate-executor = { path = "../executor" }
txpool = { package = "sc-transaction-pool", path = "../transaction-pool" }
sc-executor = { path = "../executor" }
txpool = { package = "sc-tracing-pool", path = "../transaction-pool" }
txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" }
rpc-servers = { package = "substrate-rpc-servers", path = "../rpc-servers" }
rpc = { package = "substrate-rpc", path = "../rpc" }
tel = { package = "substrate-telemetry", path = "../telemetry" }
offchain = { package = "substrate-offchain", path = "../offchain" }
rpc-servers = { package = "sc-rpc-server", path = "../rpc-servers" }
rpc = { package = "sc-rpc", path = "../rpc" }
tel = { package = "sc-telemetry", path = "../telemetry" }
offchain = { package = "sc-offchain", path = "../offchain" }
parity-multiaddr = { package = "parity-multiaddr", version = "0.5.0" }
grafana-data-source = { path = "../grafana-data-source" }
substrate-tracing = { package = "substrate-tracing", path = "../tracing" }
sc-tracing = { package = "sc-tracing", path = "../tracing" }
tracing = "0.1.10"
[dev-dependencies]
substrate-test-runtime-client = { path = "../../test/utils/runtime/client" }
babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../primitives/consensus/babe" }
grandpa = { package = "substrate-finality-grandpa", path = "../finality-grandpa" }
grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../../primitives/finality-grandpa" }
babe-primitives = { package = "sp-consensus-babe", path = "../../primitives/consensus/babe" }
grandpa = { package = "sc-finality-grandpa", path = "../finality-grandpa" }
grandpa-primitives = { package = "sp-finality-granpda", path = "../../primitives/finality-grandpa" }
tokio = "0.1"
substrate/client/service/src/builder.rs
+7 -7
View File
@@ -40,12 +40,12 @@ use network::{config::BoxFinalityProofRequestBuilder, specialization::NetworkSpe
use parking_lot::{Mutex, RwLock};
use primitives::{Blake2Hasher, H256, Hasher};
use rpc;
use sr_api::ConstructRuntimeApi;
use sr_primitives::generic::BlockId;
use sr_primitives::traits::{
use sp_api::ConstructRuntimeApi;
use sp_runtime::generic::BlockId;
use sp_runtime::traits::{
Block as BlockT, ProvideRuntimeApi, NumberFor, Header, SaturatedConversion,
};
use substrate_executor::{NativeExecutor, NativeExecutionDispatch};
use sc_executor::{NativeExecutor, NativeExecutionDispatch};
use std::{
io::{Read, Write, Seek},
marker::PhantomData, sync::Arc, time::SystemTime
@@ -712,11 +712,11 @@ ServiceBuilder<
> where
Client<TBackend, TExec, TBl, TRtApi>: ProvideRuntimeApi,
<Client<TBackend, TExec, TBl, TRtApi> as ProvideRuntimeApi>::Api:
sr_api::Metadata<TBl> +
sp_api::Metadata<TBl> +
offchain::OffchainWorkerApi<TBl> +
txpool_runtime_api::TaggedTransactionQueue<TBl> +
session::SessionKeys<TBl> +
sr_api::ApiExt<TBl, Error = sp_blockchain::Error>,
sp_api::ApiExt<TBl, Error = sp_blockchain::Error>,
TBl: BlockT<Hash = <Blake2Hasher as Hasher>::Out>,
TRtApi: ConstructRuntimeApi<TBl, Client<TBackend, TExec, TBl, TRtApi>> + 'static + Send + Sync,
TCfg: Default,
@@ -1119,7 +1119,7 @@ ServiceBuilder<
// Instrumentation
if let Some(tracing_targets) = config.tracing_targets.as_ref() {
let subscriber = substrate_tracing::ProfilingSubscriber::new(
let subscriber = sc_tracing::ProfilingSubscriber::new(
config.tracing_receiver, tracing_targets
);
match tracing::subscriber::set_global_default(subscriber) {
substrate/client/service/src/chain_ops.rs
+2 -2
View File
@@ -26,10 +26,10 @@ use futures03::{
TryFutureExt as _,
};
use primitives::{Blake2Hasher, Hasher};
use sr_primitives::traits::{
use sp_runtime::traits::{
Block as BlockT, NumberFor, One, Zero, Header, SaturatedConversion
};
use sr_primitives::generic::{BlockId, SignedBlock};
use sp_runtime::generic::{BlockId, SignedBlock};
use codec::{Decode, Encode, IoReader};
use client::Client;
use consensus_common::import_queue::{IncomingBlock, Link, BlockImportError, BlockImportResult, ImportQueue};
substrate/client/service/src/config.rs
+2 -2
View File
@@ -19,7 +19,7 @@
pub use client::ExecutionStrategies;
pub use client_db::{kvdb::KeyValueDB, PruningMode};
pub use network::config::{ExtTransport, NetworkConfiguration, Roles};
pub use substrate_executor::WasmExecutionMethod;
pub use sc_executor::WasmExecutionMethod;
use std::{path::PathBuf, net::SocketAddr, sync::Arc};
pub use txpool::txpool::Options as TransactionPoolOptions;
@@ -103,7 +103,7 @@ pub struct Configuration<C, G, E = NoExtension> {
/// Tracing targets
pub tracing_targets: Option<String>,
/// Tracing receiver
pub tracing_receiver: substrate_tracing::TracingReceiver,
pub tracing_receiver: sc_tracing::TracingReceiver,
}
/// Configuration of the database of the client.
substrate/client/service/src/lib.rs
+5 -5
View File
@@ -49,8 +49,8 @@ use network::{
use log::{log, warn, debug, error, Level};
use codec::{Encode, Decode};
use primitives::{Blake2Hasher, H256};
use sr_primitives::generic::BlockId;
use sr_primitives::traits::{NumberFor, Block as BlockT};
use sp_runtime::generic::BlockId;
use sp_runtime::traits::{NumberFor, Block as BlockT};
pub use self::error::Error;
pub use self::builder::{ServiceBuilder, ServiceBuilderCommand};
@@ -595,7 +595,7 @@ fn transactions_to_propagate<Pool, B, H, E>(pool: &Pool)
where
Pool: TransactionPool<Block=B, Hash=H, Error=E>,
B: BlockT,
H: std::hash::Hash + Eq + sr_primitives::traits::Member + sr_primitives::traits::MaybeSerialize,
H: std::hash::Hash + Eq + sp_runtime::traits::Member + sp_runtime::traits::MaybeSerialize,
E: IntoPoolError + From<txpool_api::error::Error>,
{
pool.ready()
@@ -614,7 +614,7 @@ where
C: network::ClientHandle<B> + Send + Sync,
Pool: 'static + TransactionPool<Block=B, Hash=H, Error=E>,
B: BlockT,
H: std::hash::Hash + Eq + sr_primitives::traits::Member + sr_primitives::traits::MaybeSerialize,
H: std::hash::Hash + Eq + sp_runtime::traits::Member + sp_runtime::traits::MaybeSerialize,
E: 'static + IntoPoolError + From<txpool_api::error::Error>,
{
fn transactions(&self) -> Vec<(H, <B as BlockT>::Extrinsic)> {
@@ -678,7 +678,7 @@ mod tests {
use super::*;
use futures03::executor::block_on;
use consensus_common::SelectChain;
use sr_primitives::traits::BlindCheckable;
use sp_runtime::traits::BlindCheckable;
use substrate_test_runtime_client::{prelude::*, runtime::{Extrinsic, Transfer}};
use txpool::{BasicPool, FullChainApi};
substrate/client/service/test/Cargo.toml
+7 -7
View File
@@ -1,5 +1,5 @@
[package]
name = "substrate-service-test"
name = "sc-service-test"
version = "2.0.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
@@ -12,10 +12,10 @@ log = "0.4.8"
env_logger = "0.7.0"
fdlimit = "0.1.1"
futures03 = { package = "futures", version = "0.3.1", features = ["compat"] }
service = { package = "substrate-service", path = "../../service", default-features = false }
network = { package = "substrate-network", path = "../../network" }
consensus = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" }
client = { package = "substrate-client", path = "../../" }
sr-primitives = { path = "../../../primitives/sr-primitives" }
primitives = { package = "substrate-primitives", path = "../../../primitives/core" }
service = { package = "sc-service", path = "../../service", default-features = false }
network = { package = "sc-network", path = "../../network" }
consensus = { package = "sp-consensus", path = "../../../primitives/consensus/common" }
client = { package = "sc-client", path = "../../" }
sp-runtime = { path = "../../../primitives/sr-primitives" }
primitives = { package = "sp-core", path = "../../../primitives/core" }
txpool-api = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool" }
substrate/client/service/test/src/lib.rs
+1 -1
View File
@@ -35,7 +35,7 @@ use service::{
};
use network::{multiaddr, Multiaddr};
use network::config::{NetworkConfiguration, TransportConfig, NodeKeyConfig, Secret, NonReservedPeerMode};
use sr_primitives::{generic::BlockId, traits::Block as BlockT};
use sp_runtime::{generic::BlockId, traits::Block as BlockT};
use txpool_api::TransactionPool;
/// Maximum duration of single wait call.