Merge pull request paritytech#67 from subspace/subspace-testnet-prepa…

…ration

Subspace testnet preparation

.dockerignore

@@ -4,7 +4,6 @@
 !/.git/config
 !/.git/HEAD
 !/crates
-!/node-template-subspace
 !/substrate
 !/Cargo.lock
 !/Cargo.toml

Cargo.toml

@@ -2,8 +2,6 @@
 resolver = "2"
 members = [
     "crates/*",
-    "node-template-subspace/node",
-    "node-template-subspace/runtime",
     "substrate/*",
 ]
 

Dockerfile-farmer

@@ -21,7 +21,6 @@ COPY Cargo.toml /code/Cargo.toml
 
 COPY crates /code/crates
 COPY substrate /code/substrate
-COPY node-template-subspace /code/node-template-subspace
 
 RUN \
     /root/.cargo/bin/cargo build --release --bin subspace-farmer && \

Dockerfile-node

@@ -19,16 +19,16 @@ COPY Cargo.toml /code/Cargo.toml
 
 # Up until this line all Rust images in this repo should be the same to share the same layers
 
+# Just enough files for `git rev-parse --short HEAD` to work (used in Substrate node build)
 COPY .git /code/.git
 # Just an empty directory for Git to recognize it is indeed a Git repository
 RUN mkdir /code/.git/objects
 COPY crates /code/crates
 COPY substrate /code/substrate
-COPY node-template-subspace /code/node-template-subspace
 
 RUN \
-    /root/.cargo/bin/cargo build --release --bin node-template-subspace && \
-    mv target/release/node-template-subspace subspace-node && \
+    /root/.cargo/bin/cargo build --release --bin subspace-node && \
+    mv target/release/subspace-node subspace-node && \
     rm -rf target
 
 FROM ubuntu:20.04

README.md

@@ -11,14 +11,15 @@ Subspace node/client using Substrate framework and farmer app implementations.
 The structure of this repository is the following:
 
 - `crates` contains Subspace-specific Rust crates used to build node and farmer, most are following Substrate naming conventions
+  - `subspace-node` is an implementation of the node for Subspace protocol
+  - `subspace-farmer` is a CLI farmer app
 - `substrate` contains modified copies of Substrate's crates that we use for testing
-- `node-template-subspace` is the current implementation of the node for Subspace protocol
 
 ### How to run
 
 This is a monorepo with multiple binaries and the workflow is typical for Rust projects:
 
-- `cargo run --release --bin node-template-subspace -- --dev --tmp` to run [a node](node-template-subspace)
+- `cargo run --release --bin subspace-node -- --dev --tmp` to run [a node](crates/subspace-node)
 - `cargo run --release --bin subspace-farmer -- farm` to [start farming](crates/subspace-farmer#start-the-farmer)
 
 NOTE: You need to have `nightly` version of Rust toolchain with `wasm32-unknown-unknown` target available or else you'll get a compilation error.