Merge branch 'prgn-remove-old-service-second-try' of github.com:parit…

…ytech/polkadot into prgn-remove-old-service-second-try * 'prgn-remove-old-service-second-try' of github.com:paritytech/polkadot: rename polkadot-service-new -> polkadot-service
paritytech · Sep 21, 2020 · 1d03ed6 · 1d03ed6
2 parents 036080b + 838248b
commit 1d03ed6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 [dependencies]
 cli = { package = "polkadot-cli", path = "cli" }
 futures = "0.3.4"
-service = { package = "polkadot-service-new", path = "node/service" }
+service = { package = "polkadot-service", path = "node/service" }
 parity-util-mem = { version = "*", default-features = false, features = ["jemalloc-global"] }
 
 [dev-dependencies]

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -24,7 +24,7 @@ sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "mas
 sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
-service = { package = "polkadot-service-new", path = "../node/service", default-features = false, optional = true }
+service = { package = "polkadot-service", path = "../node/service", default-features = false, optional = true }
 
 tokio = { version = "0.2.13", features = ["rt-threaded"], optional = true }
 frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }

diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "polkadot-service-new"
+name = "polkadot-service"
 version = "0.8.3"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"

diff --git a/node/test-service/Cargo.toml b/node/test-service/Cargo.toml
@@ -17,7 +17,7 @@ polkadot-overseer = { path = "../overseer" }
 polkadot-primitives = { path = "../../primitives" }
 polkadot-rpc = { path = "../../rpc" }
 polkadot-runtime-common = { path = "../../runtime/common" }
-polkadot-service = { package = "polkadot-service-new", path = "../service" }
+polkadot-service = { path = "../service" }
 polkadot-test-runtime = { path = "../../runtime/test-runtime" }
 
 # Substrate dependencies