clean up workspaces a little

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 = [

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" }

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" }

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"

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" }

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"

substrate/runtime-std/Cargo.toml

+[package]
+name = "runtime-std"
+version = "0.1.0"
+authors = ["Robert Habermeier <rphmeier@gmail.com>"]
+
+[dependencies]

substrate/runtime-std/src/lib.rs

+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {
+        assert_eq!(2 + 2, 4);
+    }
+}