From 2c39e247d61b51ecf76ace81e2c859ad2616601b Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Tue, 30 Jan 2018 19:35:09 +0100
Subject: [PATCH] clean up workspaces a little
---
substrate/Cargo.toml | 6 +++---
substrate/cli/Cargo.toml | 2 +-
substrate/client/Cargo.toml | 2 +-
substrate/executor/Cargo.toml | 2 +-
substrate/native-runtime/std/Cargo.toml | 2 +-
substrate/{rpc_servers => rpc-servers}/Cargo.toml | 0
substrate/{rpc_servers => rpc-servers}/src/lib.rs | 0
substrate/rpc/Cargo.toml | 2 +-
substrate/runtime-std/Cargo.toml | 6 ++++++
substrate/runtime-std/src/lib.rs | 7 +++++++
substrate/{state_machine => state-machine}/Cargo.toml | 0
substrate/{state_machine => state-machine}/src/backend.rs | 0
substrate/{state_machine => state-machine}/src/ext.rs | 0
substrate/{state_machine => state-machine}/src/lib.rs | 0
14 files changed, 21 insertions(+), 8 deletions(-)
rename substrate/{rpc_servers => rpc-servers}/Cargo.toml (100%)
rename substrate/{rpc_servers => rpc-servers}/src/lib.rs (100%)
create mode 100644 substrate/runtime-std/Cargo.toml
create mode 100644 substrate/runtime-std/src/lib.rs
rename substrate/{state_machine => state-machine}/Cargo.toml (100%)
rename substrate/{state_machine => state-machine}/src/backend.rs (100%)
rename substrate/{state_machine => state-machine}/src/ext.rs (100%)
rename substrate/{state_machine => state-machine}/src/lib.rs (100%)
diff --git a/substrate/Cargo.toml b/substrate/Cargo.toml
index f01f860386c..6215e20ce8b 100644
--- a/substrate/Cargo.toml
+++ b/substrate/Cargo.toml
@@ -14,13 +14,13 @@ members = [
"collator",
"environmental",
"executor",
+ "native-runtime",
"primitives",
+ "rpc-servers",
"rpc",
- "rpc_servers",
- "native-runtime",
"runtime-codec",
"serializer",
- "state_machine",
+ "state-machine",
"validator",
]
exclude = [
diff --git a/substrate/cli/Cargo.toml b/substrate/cli/Cargo.toml
index 64305642bfa..6d857023f79 100644
--- a/substrate/cli/Cargo.toml
+++ b/substrate/cli/Cargo.toml
@@ -12,4 +12,4 @@ log = "0.3"
polkadot-client = { path = "../client", version = "0.1" }
polkadot-executor = { path = "../executor", version = "0.1" }
polkadot-primitives = { path = "../primitives", version = "0.1" }
-polkadot-rpc-servers = { path = "../rpc_servers", version = "0.1" }
+polkadot-rpc-servers = { path = "../rpc-servers", version = "0.1" }
diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml
index 2142732b5db..399e2ca823c 100644
--- a/substrate/client/Cargo.toml
+++ b/substrate/client/Cargo.toml
@@ -6,4 +6,4 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
error-chain = "0.11"
polkadot-primitives = { path = "../primitives", version = "0.1" }
-polkadot-state-machine = { path = "../state_machine", version = "0.1" }
+polkadot-state-machine = { path = "../state-machine", version = "0.1" }
diff --git a/substrate/executor/Cargo.toml b/substrate/executor/Cargo.toml
index f27f7e2b26b..22fe96bdee9 100644
--- a/substrate/executor/Cargo.toml
+++ b/substrate/executor/Cargo.toml
@@ -8,7 +8,7 @@ error-chain = "0.11"
polkadot-runtime-codec = { path = "../runtime-codec", version = "0.1" }
polkadot-primitives = { path = "../primitives", version = "0.1" }
polkadot-serializer = { path = "../serializer", version = "0.1" }
-polkadot-state-machine = { path = "../state_machine" , version = "0.1" }
+polkadot-state-machine = { path = "../state-machine" , version = "0.1" }
serde = "1.0"
serde_derive = "1.0"
parity-wasm = "0.15.0"
diff --git a/substrate/native-runtime/std/Cargo.toml b/substrate/native-runtime/std/Cargo.toml
index 0976e4b378f..d0d91352dda 100644
--- a/substrate/native-runtime/std/Cargo.toml
+++ b/substrate/native-runtime/std/Cargo.toml
@@ -9,6 +9,6 @@ strict = []
[dependencies]
lazy_static = "1.0.0"
parking_lot = "0.5"
-polkadot-state-machine = { path = "../../state_machine" , version = "0.1" }
+polkadot-state-machine = { path = "../../state-machine" , version = "0.1" }
environmental = { path = "../../environmental", version = "0.1.0" }
polkadot-primitives = { path = "../../primitives", version = "0.1.0" }
diff --git a/substrate/rpc_servers/Cargo.toml b/substrate/rpc-servers/Cargo.toml
similarity index 100%
rename from substrate/rpc_servers/Cargo.toml
rename to substrate/rpc-servers/Cargo.toml
diff --git a/substrate/rpc_servers/src/lib.rs b/substrate/rpc-servers/src/lib.rs
similarity index 100%
rename from substrate/rpc_servers/src/lib.rs
rename to substrate/rpc-servers/src/lib.rs
diff --git a/substrate/rpc/Cargo.toml b/substrate/rpc/Cargo.toml
index 66d11d94dd4..8095f88fff1 100644
--- a/substrate/rpc/Cargo.toml
+++ b/substrate/rpc/Cargo.toml
@@ -9,7 +9,7 @@ jsonrpc-core = { git="https://github.com/paritytech/jsonrpc.git" }
jsonrpc-macros = { git="https://github.com/paritytech/jsonrpc.git" }
polkadot-client = { path = "../client", version = "0.1" }
polkadot-primitives = { path = "../primitives", version = "0.1" }
-polkadot-state-machine = { path = "../state_machine", version = "0.1" }
+polkadot-state-machine = { path = "../state-machine", version = "0.1" }
[dev-dependencies]
assert_matches = "1.1"
diff --git a/substrate/runtime-std/Cargo.toml b/substrate/runtime-std/Cargo.toml
new file mode 100644
index 00000000000..5507e125790
--- /dev/null
+++ b/substrate/runtime-std/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "runtime-std"
+version = "0.1.0"
+authors = ["Robert Habermeier <rphmeier@gmail.com>"]
+
+[dependencies]
diff --git a/substrate/runtime-std/src/lib.rs b/substrate/runtime-std/src/lib.rs
new file mode 100644
index 00000000000..31e1bb209f9
--- /dev/null
+++ b/substrate/runtime-std/src/lib.rs
@@ -0,0 +1,7 @@
+#[cfg(test)]
+mod tests {
+ #[test]
+ fn it_works() {
+ assert_eq!(2 + 2, 4);
+ }
+}
diff --git a/substrate/state_machine/Cargo.toml b/substrate/state-machine/Cargo.toml
similarity index 100%
rename from substrate/state_machine/Cargo.toml
rename to substrate/state-machine/Cargo.toml
diff --git a/substrate/state_machine/src/backend.rs b/substrate/state-machine/src/backend.rs
similarity index 100%
rename from substrate/state_machine/src/backend.rs
rename to substrate/state-machine/src/backend.rs
diff --git a/substrate/state_machine/src/ext.rs b/substrate/state-machine/src/ext.rs
similarity index 100%
rename from substrate/state_machine/src/ext.rs
rename to substrate/state-machine/src/ext.rs
diff --git a/substrate/state_machine/src/lib.rs b/substrate/state-machine/src/lib.rs
similarity index 100%
rename from substrate/state_machine/src/lib.rs
rename to substrate/state-machine/src/lib.rs
--
GitLab