Rename cumulus-test-parachain-collator to rococo-collator (#173)

Ran `find . -type f -name "*" -print0 | xargs -0 sed -i -e "s/cumulus-test-parachain-collator/rococo-collator/g"`

cumulus/Cargo.lock

@@ -1060,65 +1060,6 @@ dependencies = [
  "substrate-test-client",
 ]
 
-[[package]]
-name = "cumulus-test-parachain-collator"
-version = "0.1.0"
-dependencies = [
- "ansi_term 0.12.1",
- "assert_cmd",
- "cumulus-collator",
- "cumulus-consensus",
- "cumulus-network",
- "cumulus-primitives",
- "cumulus-test-parachain-runtime",
- "derive_more 0.15.0",
- "exit-future 0.1.4",
- "futures 0.3.5",
- "hex-literal",
- "log 0.4.11",
- "nix 0.17.0",
- "pallet-sudo",
- "parity-scale-codec",
- "parking_lot 0.9.0",
- "polkadot-cli",
- "polkadot-collator",
- "polkadot-parachain",
- "polkadot-primitives",
- "polkadot-runtime-common",
- "polkadot-service",
- "polkadot-test-runtime",
- "polkadot-test-runtime-client",
- "polkadot-test-service",
- "rand 0.7.3",
- "sc-basic-authorship",
- "sc-chain-spec",
- "sc-cli",
- "sc-client-api",
- "sc-consensus",
- "sc-executor",
- "sc-finality-grandpa",
- "sc-informant",
- "sc-network",
- "sc-service",
- "sc-transaction-pool",
- "serde",
- "sp-api",
- "sp-consensus",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-runtime",
- "sp-timestamp",
- "sp-transaction-pool",
- "sp-trie",
- "structopt",
- "substrate-build-script-utils",
- "substrate-test-client",
- "substrate-test-runtime-client",
- "tokio 0.2.22",
- "trie-root 0.15.2",
-]
-
 [[package]]
 name = "cumulus-test-parachain-runtime"
 version = "0.1.0"
@@ -5683,6 +5624,65 @@ dependencies = [
  "librocksdb-sys",
 ]
 
+[[package]]
+name = "rococo-collator"
+version = "0.1.0"
+dependencies = [
+ "ansi_term 0.12.1",
+ "assert_cmd",
+ "cumulus-collator",
+ "cumulus-consensus",
+ "cumulus-network",
+ "cumulus-primitives",
+ "cumulus-test-parachain-runtime",
+ "derive_more 0.15.0",
+ "exit-future 0.1.4",
+ "futures 0.3.5",
+ "hex-literal",
+ "log 0.4.11",
+ "nix 0.17.0",
+ "pallet-sudo",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+ "polkadot-cli",
+ "polkadot-collator",
+ "polkadot-parachain",
+ "polkadot-primitives",
+ "polkadot-runtime-common",
+ "polkadot-service",
+ "polkadot-test-runtime",
+ "polkadot-test-runtime-client",
+ "polkadot-test-service",
+ "rand 0.7.3",
+ "sc-basic-authorship",
+ "sc-chain-spec",
+ "sc-cli",
+ "sc-client-api",
+ "sc-consensus",
+ "sc-executor",
+ "sc-finality-grandpa",
+ "sc-informant",
+ "sc-network",
+ "sc-service",
+ "sc-transaction-pool",
+ "serde",
+ "sp-api",
+ "sp-consensus",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-runtime",
+ "sp-timestamp",
+ "sp-transaction-pool",
+ "sp-trie",
+ "structopt",
+ "substrate-build-script-utils",
+ "substrate-test-client",
+ "substrate-test-runtime-client",
+ "tokio 0.2.22",
+ "trie-root 0.15.2",
+]
+
 [[package]]
 name = "rococo-runtime"
 version = "0.8.22"

cumulus/README.md

@@ -29,13 +29,13 @@ Collators are similar to validators in the relay chain. These nodes build the bl
 To run a collator on this test network you will need to compile the following binary:
 
 ```
-cargo build --release -p cumulus-test-parachain-collator
+cargo build --release -p rococo-collator
 ```
 
 After the build is finished you can use the binary to run a collator for all three parachains:
 
 ```
-./target/release/cumulus-test-parachain-collator --chain tick --validator
+./target/release/rococo-collator --chain tick --validator
 ```
 
 This will run the collator for the `Tick` parachain. To run a collator for one of the other nodes, the chain argument needs to be changed.
@@ -45,13 +45,13 @@ This will run the collator for the `Tick` parachain. To run a collator for one o
 To run a full node that should sync one of the parachains, you need to compile the following binary:
 
 ```
-cargo build --release -p cumulus-test-parachain-collator
+cargo build --release -p rococo-collator
 ```
 
 After the build is finished you can use the binary to run a collator for all three parachains:
 
 ```
-./target/release/cumulus-test-parachain-collator --chain tick
+./target/release/rococo-collator --chain tick
 ```
 
 ### Tick, Trick and Track

cumulus/docker/docker-compose.yml

@@ -66,7 +66,7 @@ services:
     volumes:
       - "genesis-state:/data"
     command: >
-      cumulus-test-parachain-collator
+      rococo-collator
       export-genesis-state
       /data/genesis-state
 

cumulus/docker/scripts/inject_bootnodes.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# this script runs the cumulus-test-parachain-collator after fetching
+# this script runs the rococo-collator after fetching
 # appropriate bootnode IDs
 #
 # this is _not_ a general-purpose script; it is closely tied to the
@@ -8,7 +8,7 @@
 
 set -e -o pipefail
 
-ctpc="/usr/bin/cumulus-test-parachain-collator"
+ctpc="/usr/bin/rococo-collator"
 
 if [ ! -x "$ctpc" ]; then
     echo "FATAL: $ctpc does not exist or is not executable"

cumulus/docker/test-parachain-collator.dockerfile

@@ -19,7 +19,7 @@ WORKDIR /paritytech/cumulus
 # not the actual directory. We're stuck just enumerating them.
 COPY . .
 
-RUN cargo build --release -p cumulus-test-parachain-collator
+RUN cargo build --release -p rococo-collator
 
 # the collator stage is normally built once, cached, and then ignored, but can
 # be specified with the --target build flag. This adds some extra tooling to the
@@ -38,7 +38,7 @@ RUN apt-get update && apt-get install jq curl bash -y && \
     npm install --global yarn && \
     yarn global add @polkadot/api-cli@0.10.0-beta.14
 COPY --from=builder \
-    /paritytech/cumulus/target/release/cumulus-test-parachain-collator /usr/bin
+    /paritytech/cumulus/target/release/rococo-collator /usr/bin
 COPY ./docker/scripts/inject_bootnodes.sh /usr/bin
 CMD ["/usr/bin/inject_bootnodes.sh"]
 COPY ./docker/scripts/healthcheck.sh /usr/bin/
@@ -56,6 +56,6 @@ CMD ["cp", "-v", "/var/opt/cumulus_test_parachain_runtime.compact.wasm", "/runti
 
 FROM debian:buster-slim
 COPY --from=builder \
-    /paritytech/cumulus/target/release/cumulus-test-parachain-collator /usr/bin
+    /paritytech/cumulus/target/release/rococo-collator /usr/bin
 
-CMD ["/usr/bin/cumulus-test-parachain-collator"]
+CMD ["/usr/bin/rococo-collator"]

cumulus/test/parachain/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = 'cumulus-test-parachain-collator'
+name = 'rococo-collator'
 version = '0.1.0'
 authors = ["Parity Technologies <admin@parity.io>"]
 build = 'build.rs'
 edition = '2018'
 
 [[bin]]
-name = 'cumulus-test-parachain-collator'
+name = 'rococo-collator'
 path = 'src/main.rs'
 
 [dependencies]

cumulus/test/parachain/src/command.rs

@@ -104,7 +104,7 @@ impl SubstrateCli for RelayChainCli {
 		"Cumulus test parachain collator\n\nThe command-line arguments provided first will be \
 		passed to the parachain node, while the arguments provided after -- will be passed \
 		to the relaychain node.\n\n\
-		cumulus-test-parachain-collator [parachain-args] -- [relaychain-args]"
+		rococo-collator [parachain-args] -- [relaychain-args]"
 			.into()
 	}
 

cumulus/test/parachain/tests/polkadot_argument_parsing.rs

@@ -32,7 +32,7 @@ fn polkadot_argument_parsing() {
 
 	fn run_command_and_kill(signal: Signal) {
 		let _ = fs::remove_dir_all("polkadot_argument_parsing");
-		let mut cmd = Command::new(cargo_bin("cumulus-test-parachain-collator"))
+		let mut cmd = Command::new(cargo_bin("rococo-collator"))
 			.args(&[
 				"-d",
 				"polkadot_argument_parsing",

cumulus/test/parachain/tests/polkadot_mdns_issue.rs

@@ -32,7 +32,7 @@ fn interrupt_polkadot_mdns_issue_test() {
 
 	fn run_command_and_kill(signal: Signal) {
 		let _ = fs::remove_dir_all("interrupt_polkadot_mdns_issue_test");
-		let mut cmd = Command::new(cargo_bin("cumulus-test-parachain-collator"))
+		let mut cmd = Command::new(cargo_bin("rococo-collator"))
 			.args(&["-d", "interrupt_polkadot_mdns_issue_test", "--", "--dev"])
 			.spawn()
 			.unwrap();

cumulus/test/parachain/tests/purge_chain_works.rs

@@ -30,7 +30,7 @@ fn purge_chain_works() {
 	let base_path = "purge_chain_test";
 
 	let _ = fs::remove_dir_all(base_path);
-	let mut cmd = Command::new(cargo_bin("cumulus-test-parachain-collator"))
+	let mut cmd = Command::new(cargo_bin("rococo-collator"))
 		.args(&["-d", base_path, "--", "--dev"])
 		.spawn()
 		.unwrap();
@@ -48,7 +48,7 @@ fn purge_chain_works() {
 		.map(|x| x.success())
 		.unwrap_or_default());
 
-	let status = Command::new(cargo_bin("cumulus-test-parachain-collator"))
+	let status = Command::new(cargo_bin("rococo-collator"))
 		.args(&["purge-chain", "-d", base_path, "-y"])
 		.status()
 		.unwrap();

cumulus/test/parachain/tests/running_the_node_and_interrupt.rs

@@ -32,7 +32,7 @@ fn running_the_node_works_and_can_be_interrupted() {
 
 	fn run_command_and_kill(signal: Signal) {
 		let _ = fs::remove_dir_all("interrupt_test");
-		let mut cmd = Command::new(cargo_bin("cumulus-test-parachain-collator"))
+		let mut cmd = Command::new(cargo_bin("rococo-collator"))
 			.args(&["-d", "interrupt_test", "--", "--dev"])
 			.spawn()
 			.unwrap();