diff --git a/Cargo.lock b/Cargo.lock index 40f091db0f579..4cfd25f917c49 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3006,7 +3006,7 @@ dependencies = [ "sc-service 2.0.0", "sc-service-test 2.0.0", "sc-telemetry 2.0.0", - "sc-tracing-pool 2.0.0", + "sc-transaction-pool 2.0.0", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "sp-authority-discovery 2.0.0", "sp-consensus 2.0.0", @@ -3175,7 +3175,7 @@ dependencies = [ "sc-finality-grandpa 2.0.0", "sc-network 2.0.0", "sc-service 2.0.0", - "sc-tracing-pool 2.0.0", + "sc-transaction-pool 2.0.0", "sp-consensus 2.0.0", "sp-consensus-aura 2.0.0", "sp-core 2.0.0", @@ -4852,7 +4852,7 @@ dependencies = [ "sc-client 2.0.0", "sc-client-api 2.0.0", "sc-telemetry 2.0.0", - "sc-tracing-pool 2.0.0", + "sc-transaction-pool 2.0.0", "sp-blockchain 2.0.0", "sp-consensus 2.0.0", "sp-core 2.0.0", @@ -5342,7 +5342,7 @@ dependencies = [ "sc-client-db 2.0.0", "sc-keystore 2.0.0", "sc-network 2.0.0", - "sc-tracing-pool 2.0.0", + "sc-transaction-pool 2.0.0", "sp-api 2.0.0", "sp-core 2.0.0", "sp-offchain 2.0.0", @@ -5384,7 +5384,7 @@ dependencies = [ "sc-keystore 2.0.0", "sc-network 2.0.0", "sc-rpc-api 2.0.0", - "sc-tracing-pool 2.0.0", + "sc-transaction-pool 2.0.0", "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", "sp-api 2.0.0", "sp-blockchain 2.0.0", @@ -5475,7 +5475,7 @@ dependencies = [ "sc-rpc-server 2.0.0", "sc-telemetry 2.0.0", "sc-tracing 2.0.0", - "sc-tracing-pool 2.0.0", + "sc-transaction-pool 2.0.0", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5568,7 +5568,7 @@ dependencies = [ ] [[package]] -name = "sc-tracing-graph" +name = "sc-transaction-graph" version = "2.0.0" dependencies = [ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5587,7 +5587,7 @@ dependencies = [ ] [[package]] -name = "sc-tracing-pool" +name = "sc-transaction-pool" version = "2.0.0" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5596,7 +5596,7 @@ dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "sc-client-api 2.0.0", - "sc-tracing-graph 2.0.0", + "sc-transaction-graph 2.0.0", "sp-api 2.0.0", "sp-blockchain 2.0.0", "sp-core 2.0.0", @@ -6578,7 +6578,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "sc-client 2.0.0", - "sc-tracing-pool 2.0.0", + "sc-transaction-pool 2.0.0", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "sp-blockchain 2.0.0", "sp-core 2.0.0", diff --git a/bin/node-template/Cargo.toml b/bin/node-template/Cargo.toml index 37501cd96bbfc..bfe39ee0c77c4 100644 --- a/bin/node-template/Cargo.toml +++ b/bin/node-template/Cargo.toml @@ -24,7 +24,7 @@ primitives = { package = "sp-core", path = "../../primitives/core" } sc-executor = { path = "../../client/executor" } sc-service = { path = "../../client/service" } inherents = { package = "sp-inherents", path = "../../primitives/inherents" } -txpool = { package = "sc-tracing-pool", path = "../../client/transaction-pool" } +txpool = { package = "sc-transaction-pool", path = "../../client/transaction-pool" } txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" } network = { package = "sc-network", path = "../../client/network" } aura = { package = "sc-consensus-aura", path = "../../client/consensus/aura" } diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml index 4d3556bd51ae6..6b61f7abe0618 100644 --- a/bin/node/cli/Cargo.toml +++ b/bin/node/cli/Cargo.toml @@ -49,7 +49,7 @@ runtime-io = { package = "sp-io", path = "../../../primitives/sr-io" } client-api = { package = "sc-client-api", path = "../../../client/api" } client = { package = "sc-client", path = "../../../client/" } chain-spec = { package = "sc-chain-spec", path = "../../../client/chain-spec" } -txpool = { package = "sc-tracing-pool", path = "../../../client/transaction-pool" } +txpool = { package = "sc-transaction-pool", path = "../../../client/transaction-pool" } txpool-api = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool" } network = { package = "sc-network", path = "../../../client/network" } babe = { package = "sc-consensus-babe", path = "../../../client/consensus/babe" } diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml index ba61625516c09..3f4cbb0bc61c9 100644 --- a/client/basic-authorship/Cargo.toml +++ b/client/basic-authorship/Cargo.toml @@ -21,6 +21,6 @@ block-builder = { package = "sc-block-builder", path = "../block-builder" } tokio-executor = { version = "0.2.0-alpha.6", features = ["blocking"] } [dev-dependencies] -txpool = { package = "sc-tracing-pool", path = "../../client/transaction-pool" } +txpool = { package = "sc-transaction-pool", path = "../../client/transaction-pool" } test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } parking_lot = "0.9" diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml index dafbffd39b54b..1b30c2fcfff56 100644 --- a/client/offchain/Cargo.toml +++ b/client/offchain/Cargo.toml @@ -35,7 +35,7 @@ client-db = { package = "sc-client-db", path = "../db/", default-features = true env_logger = "0.7.0" test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } tokio = "0.1.22" -txpool = { package = "sc-tracing-pool", path = "../../client/transaction-pool" } +txpool = { package = "sc-transaction-pool", path = "../../client/transaction-pool" } txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" } [features] diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml index b387a3099d3a6..5bb947eb0c15d 100644 --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -36,4 +36,4 @@ rustc-hex = "2.0.1" sp-io = { path = "../../primitives/sr-io" } test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } tokio = "0.1.22" -txpool = { package = "sc-tracing-pool", path = "../transaction-pool" } +txpool = { package = "sc-transaction-pool", path = "../transaction-pool" } diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml index ea69b14e42aac..426c3a76dc01c 100644 --- a/client/service/Cargo.toml +++ b/client/service/Cargo.toml @@ -45,7 +45,7 @@ txpool-runtime-api = { package = "sp-transaction-pool-runtime-api", path = "../. client_db = { package = "sc-client-db", path = "../db" } codec = { package = "parity-scale-codec", version = "1.0.0" } sc-executor = { path = "../executor" } -txpool = { package = "sc-tracing-pool", path = "../transaction-pool" } +txpool = { package = "sc-transaction-pool", path = "../transaction-pool" } txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" } rpc-servers = { package = "sc-rpc-server", path = "../rpc-servers" } rpc = { package = "sc-rpc", path = "../rpc" } diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml index ef84a21c8baf3..9ae87d50ed68c 100644 --- a/client/transaction-pool/Cargo.toml +++ b/client/transaction-pool/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "sc-tracing-pool" +name = "sc-transaction-pool" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -13,7 +13,7 @@ parking_lot = "0.9.0" primitives = { package = "sp-core", path = "../../primitives/core" } sp-api = { path = "../../primitives/sr-api" } sp-runtime = { path = "../../primitives/sr-primitives" } -txpool = { package = "sc-tracing-graph", path = "./graph" } +txpool = { package = "sc-transaction-graph", path = "./graph" } txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" } txpool-runtime-api = { package = "sp-transaction-pool-runtime-api", path = "../../primitives/transaction-pool/runtime-api" } client-api = { package = "sc-client-api", path = "../api" } diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml index 870604d88cb90..392a39ab6d459 100644 --- a/client/transaction-pool/graph/Cargo.toml +++ b/client/transaction-pool/graph/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "sc-tracing-graph" +name = "sc-transaction-graph" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/client/transaction-pool/graph/benches/basics.rs b/client/transaction-pool/graph/benches/basics.rs index b5dc63ed5bfee..884cffea74afa 100644 --- a/client/transaction-pool/graph/benches/basics.rs +++ b/client/transaction-pool/graph/benches/basics.rs @@ -17,7 +17,7 @@ use criterion::{criterion_group, criterion_main, Criterion}; use futures::executor::block_on; -use sc_tracing_graph::*; +use sc_transaction_graph::*; use sp_runtime::transaction_validity::{ValidTransaction, InvalidTransaction}; use codec::Encode; use test_runtime::{Block, Extrinsic, Transfer, H256, AccountId}; diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml index 3bf8055551b82..8447eef7bcce1 100644 --- a/utils/frame/rpc/system/Cargo.toml +++ b/utils/frame/rpc/system/Cargo.toml @@ -22,4 +22,4 @@ txpool-api = { package = "sp-transaction-pool-api", path = "../../../../primitiv [dev-dependencies] test-client = { package = "substrate-test-runtime-client", path = "../../../../test/utils/runtime/client" } env_logger = "0.7.0" -txpool = { package = "sc-tracing-pool", path = "../../../../client/transaction-pool" } +txpool = { package = "sc-transaction-pool", path = "../../../../client/transaction-pool" }