From 4582038b3de2bed2554042b6664b29b7ec2e4fc7 Mon Sep 17 00:00:00 2001 From: Gav Date: Thu, 8 Feb 2018 14:29:30 +0100 Subject: [PATCH] Fix warning and directory restructure. --- substrate/.gitignore | 4 +- substrate/Cargo.toml | 54 ++++++++++-------- substrate/polkadot-cli/Cargo.toml | 24 -------- substrate/polkadot-executor/Cargo.toml | 17 ------ substrate/polkadot-runtime/Cargo.toml | 18 ------ substrate/polkadot-validator/Cargo.toml | 11 ---- .../candidate-agreement}/Cargo.toml | 0 .../src/bft/accumulator.rs | 0 .../candidate-agreement}/src/bft/mod.rs | 0 .../candidate-agreement}/src/bft/tests.rs | 0 .../src/handle_incoming.rs | 0 .../candidate-agreement}/src/lib.rs | 0 .../candidate-agreement}/src/round_robin.rs | 0 .../candidate-agreement}/src/table.rs | 0 .../candidate-agreement}/src/tests/mod.rs | 0 substrate/polkadot/cli/Cargo.toml | 24 ++++++++ .../cli}/src/cli.yml | 0 .../cli}/src/error.rs | 0 .../cli}/src/genesis.rs | 0 .../{polkadot-cli => polkadot/cli}/src/lib.rs | 0 .../collator}/Cargo.toml | 4 +- .../collator}/src/lib.rs | 0 substrate/polkadot/executor/Cargo.toml | 17 ++++++ .../executor}/src/lib.rs | 10 ++-- substrate/{ => polkadot}/network/Cargo.toml | 14 ++--- .../{ => polkadot}/network/src/blocks.rs | 0 substrate/{ => polkadot}/network/src/chain.rs | 0 .../{ => polkadot}/network/src/config.rs | 0 substrate/{ => polkadot}/network/src/error.rs | 0 substrate/{ => polkadot}/network/src/io.rs | 0 substrate/{ => polkadot}/network/src/lib.rs | 0 .../{ => polkadot}/network/src/message.rs | 0 .../{ => polkadot}/network/src/protocol.rs | 0 .../{ => polkadot}/network/src/service.rs | 0 substrate/{ => polkadot}/network/src/sync.rs | 0 .../{ => polkadot}/network/src/test/mod.rs | 0 .../primitives}/Cargo.toml | 8 +-- .../primitives}/src/block.rs | 0 .../primitives}/src/lib.rs | 0 .../primitives}/src/parachain.rs | 0 .../primitives}/src/transaction.rs | 0 .../primitives}/src/validator.rs | 0 substrate/polkadot/runtime/Cargo.toml | 25 ++++++++ .../runtime}/src/genesismap.rs | 0 .../runtime}/src/lib.rs | 0 .../runtime}/src/runtime/consensus.rs | 0 .../runtime}/src/runtime/governance.rs | 0 .../runtime}/src/runtime/mod.rs | 0 .../runtime}/src/runtime/parachains.rs | 0 .../runtime}/src/runtime/session.rs | 0 .../runtime}/src/runtime/staking.rs | 0 .../runtime}/src/runtime/system.rs | 0 .../runtime}/src/runtime/timestamp.rs | 0 .../runtime}/src/support/environment.rs | 0 .../runtime}/src/support/hashable.rs | 0 .../runtime}/src/support/mod.rs | 0 .../runtime}/src/support/statichex.rs | 0 .../runtime}/src/support/storage.rs | 0 .../runtime}/src/support/testing.rs | 0 .../runtime}/wasm/Cargo.lock | 0 .../runtime}/wasm/Cargo.toml | 0 .../runtime}/wasm/build.sh | 0 .../runtime}/wasm/genesis.wasm | Bin .../runtime}/wasm/init.sh | 0 .../runtime}/wasm/src | 0 .../release/polkadot_runtime.compact.wasm | Bin .../release/polkadot_runtime.wasm | Bin substrate/{ => polkadot}/src/main.rs | 0 substrate/polkadot/validator/Cargo.toml | 11 ++++ .../validator}/src/error.rs | 0 .../validator}/src/lib.rs | 0 .../validator}/src/parachains.rs | 0 .../validator}/src/validator.rs | 0 substrate/{ => substrate}/client/Cargo.toml | 0 .../{ => substrate}/client/src/backend.rs | 0 .../{ => substrate}/client/src/blockchain.rs | 0 substrate/{ => substrate}/client/src/error.rs | 0 .../{ => substrate}/client/src/in_mem.rs | 0 substrate/{ => substrate}/client/src/lib.rs | 0 substrate/{ => substrate}/codec/Cargo.toml | 0 .../codec/src/endiansensitive.rs | 0 substrate/{ => substrate}/codec/src/joiner.rs | 0 .../{ => substrate}/codec/src/keyedvec.rs | 0 substrate/{ => substrate}/codec/src/lib.rs | 0 .../{ => substrate}/codec/src/slicable.rs | 0 substrate/{ => substrate}/ed25519/Cargo.toml | 0 substrate/{ => substrate}/ed25519/src/lib.rs | 0 .../{ => substrate}/environmental/Cargo.toml | 0 .../{ => substrate}/environmental/src/lib.rs | 0 substrate/{ => substrate}/executor/Cargo.toml | 0 .../{ => substrate}/executor/src/error.rs | 0 substrate/{ => substrate}/executor/src/lib.rs | 4 -- .../executor/src/native_executor.rs | 1 + .../executor/src/wasm_executor.rs | 6 +- .../executor/src/wasm_utils.rs | 0 .../{ => substrate}/executor/wasm/Cargo.lock | 0 .../{ => substrate}/executor/wasm/Cargo.toml | 0 .../{ => substrate}/executor/wasm/build.sh | 0 .../{ => substrate}/executor/wasm/src/lib.rs | 0 .../release/runtime_test.compact.wasm | Bin .../release/runtime_test.wasm | Bin 0 -> 14116 bytes .../{ => substrate}/primitives/Cargo.toml | 0 .../{ => substrate}/primitives/src/block.rs | 0 .../{ => substrate}/primitives/src/bytes.rs | 0 .../{ => substrate}/primitives/src/hash.rs | 0 .../{ => substrate}/primitives/src/hashing.rs | 0 .../primitives/src/hexdisplay.rs | 0 .../{ => substrate}/primitives/src/lib.rs | 0 .../{ => substrate}/primitives/src/storage.rs | 0 .../{ => substrate}/primitives/src/tests.rs | 0 .../{ => substrate}/primitives/src/uint.rs | 0 .../{ => substrate}/pwasm-alloc/Cargo.toml | 0 .../{ => substrate}/pwasm-alloc/README.md | 0 .../{ => substrate}/pwasm-alloc/build.rs | 0 .../{ => substrate}/pwasm-alloc/src/lib.rs | 0 .../{ => substrate}/pwasm-libc/Cargo.toml | 0 .../{ => substrate}/pwasm-libc/README.md | 0 .../{ => substrate}/pwasm-libc/src/lib.rs | 0 .../{ => substrate}/rpc-servers/Cargo.toml | 0 .../{ => substrate}/rpc-servers/src/lib.rs | 0 substrate/{ => substrate}/rpc/Cargo.toml | 0 .../{ => substrate}/rpc/src/chain/error.rs | 0 .../{ => substrate}/rpc/src/chain/mod.rs | 0 .../{ => substrate}/rpc/src/chain/tests.rs | 0 substrate/{ => substrate}/rpc/src/lib.rs | 0 .../{ => substrate}/rpc/src/state/error.rs | 0 .../{ => substrate}/rpc/src/state/mod.rs | 0 .../{ => substrate}/rpc/src/state/tests.rs | 0 .../{ => substrate}/runtime-io/Cargo.toml | 0 substrate/{ => substrate}/runtime-io/build.rs | 0 .../{ => substrate}/runtime-io/src/lib.rs | 0 .../{ => substrate}/runtime-io/with_std.rs | 0 .../{ => substrate}/runtime-io/without_std.rs | 0 .../{ => substrate}/runtime-std/Cargo.toml | 0 .../{ => substrate}/runtime-std/build.rs | 0 .../{ => substrate}/runtime-std/src/lib.rs | 0 .../{ => substrate}/runtime-std/with_std.rs | 0 .../runtime-std/without_std.rs | 0 .../{ => substrate}/serializer/Cargo.toml | 0 .../{ => substrate}/serializer/src/lib.rs | 0 .../{ => substrate}/state-machine/Cargo.toml | 0 .../state-machine/src/backend.rs | 0 .../{ => substrate}/state-machine/src/ext.rs | 0 .../{ => substrate}/state-machine/src/lib.rs | 0 .../state-machine/src/testing.rs | 0 145 files changed, 129 insertions(+), 123 deletions(-) delete mode 100644 substrate/polkadot-cli/Cargo.toml delete mode 100644 substrate/polkadot-executor/Cargo.toml delete mode 100644 substrate/polkadot-runtime/Cargo.toml delete mode 100644 substrate/polkadot-validator/Cargo.toml rename substrate/{polkadot-candidate-agreement => polkadot/candidate-agreement}/Cargo.toml (100%) rename substrate/{polkadot-candidate-agreement => polkadot/candidate-agreement}/src/bft/accumulator.rs (100%) rename substrate/{polkadot-candidate-agreement => polkadot/candidate-agreement}/src/bft/mod.rs (100%) rename substrate/{polkadot-candidate-agreement => polkadot/candidate-agreement}/src/bft/tests.rs (100%) rename substrate/{polkadot-candidate-agreement => polkadot/candidate-agreement}/src/handle_incoming.rs (100%) rename substrate/{polkadot-candidate-agreement => polkadot/candidate-agreement}/src/lib.rs (100%) rename substrate/{polkadot-candidate-agreement => polkadot/candidate-agreement}/src/round_robin.rs (100%) rename substrate/{polkadot-candidate-agreement => polkadot/candidate-agreement}/src/table.rs (100%) rename substrate/{polkadot-candidate-agreement => polkadot/candidate-agreement}/src/tests/mod.rs (100%) create mode 100644 substrate/polkadot/cli/Cargo.toml rename substrate/{polkadot-cli => polkadot/cli}/src/cli.yml (100%) rename substrate/{polkadot-cli => polkadot/cli}/src/error.rs (100%) rename substrate/{polkadot-cli => polkadot/cli}/src/genesis.rs (100%) rename substrate/{polkadot-cli => polkadot/cli}/src/lib.rs (100%) rename substrate/{polkadot-collator => polkadot/collator}/Cargo.toml (56%) rename substrate/{polkadot-collator => polkadot/collator}/src/lib.rs (100%) create mode 100644 substrate/polkadot/executor/Cargo.toml rename substrate/{polkadot-executor => polkadot/executor}/src/lib.rs (93%) rename substrate/{ => polkadot}/network/Cargo.toml (66%) rename substrate/{ => polkadot}/network/src/blocks.rs (100%) rename substrate/{ => polkadot}/network/src/chain.rs (100%) rename substrate/{ => polkadot}/network/src/config.rs (100%) rename substrate/{ => polkadot}/network/src/error.rs (100%) rename substrate/{ => polkadot}/network/src/io.rs (100%) rename substrate/{ => polkadot}/network/src/lib.rs (100%) rename substrate/{ => polkadot}/network/src/message.rs (100%) rename substrate/{ => polkadot}/network/src/protocol.rs (100%) rename substrate/{ => polkadot}/network/src/service.rs (100%) rename substrate/{ => polkadot}/network/src/sync.rs (100%) rename substrate/{ => polkadot}/network/src/test/mod.rs (100%) rename substrate/{polkadot-primitives => polkadot/primitives}/Cargo.toml (57%) rename substrate/{polkadot-primitives => polkadot/primitives}/src/block.rs (100%) rename substrate/{polkadot-primitives => polkadot/primitives}/src/lib.rs (100%) rename substrate/{polkadot-primitives => polkadot/primitives}/src/parachain.rs (100%) rename substrate/{polkadot-primitives => polkadot/primitives}/src/transaction.rs (100%) rename substrate/{polkadot-primitives => polkadot/primitives}/src/validator.rs (100%) create mode 100644 substrate/polkadot/runtime/Cargo.toml rename substrate/{polkadot-runtime => polkadot/runtime}/src/genesismap.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/src/lib.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/src/runtime/consensus.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/src/runtime/governance.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/src/runtime/mod.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/src/runtime/parachains.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/src/runtime/session.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/src/runtime/staking.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/src/runtime/system.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/src/runtime/timestamp.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/src/support/environment.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/src/support/hashable.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/src/support/mod.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/src/support/statichex.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/src/support/storage.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/src/support/testing.rs (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/wasm/Cargo.lock (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/wasm/Cargo.toml (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/wasm/build.sh (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/wasm/genesis.wasm (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/wasm/init.sh (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/wasm/src (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm (100%) rename substrate/{polkadot-runtime => polkadot/runtime}/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm (100%) rename substrate/{ => polkadot}/src/main.rs (100%) create mode 100644 substrate/polkadot/validator/Cargo.toml rename substrate/{polkadot-validator => polkadot/validator}/src/error.rs (100%) rename substrate/{polkadot-validator => polkadot/validator}/src/lib.rs (100%) rename substrate/{polkadot-validator => polkadot/validator}/src/parachains.rs (100%) rename substrate/{polkadot-validator => polkadot/validator}/src/validator.rs (100%) rename substrate/{ => substrate}/client/Cargo.toml (100%) rename substrate/{ => substrate}/client/src/backend.rs (100%) rename substrate/{ => substrate}/client/src/blockchain.rs (100%) rename substrate/{ => substrate}/client/src/error.rs (100%) rename substrate/{ => substrate}/client/src/in_mem.rs (100%) rename substrate/{ => substrate}/client/src/lib.rs (100%) rename substrate/{ => substrate}/codec/Cargo.toml (100%) rename substrate/{ => substrate}/codec/src/endiansensitive.rs (100%) rename substrate/{ => substrate}/codec/src/joiner.rs (100%) rename substrate/{ => substrate}/codec/src/keyedvec.rs (100%) rename substrate/{ => substrate}/codec/src/lib.rs (100%) rename substrate/{ => substrate}/codec/src/slicable.rs (100%) rename substrate/{ => substrate}/ed25519/Cargo.toml (100%) rename substrate/{ => substrate}/ed25519/src/lib.rs (100%) rename substrate/{ => substrate}/environmental/Cargo.toml (100%) rename substrate/{ => substrate}/environmental/src/lib.rs (100%) rename substrate/{ => substrate}/executor/Cargo.toml (100%) rename substrate/{ => substrate}/executor/src/error.rs (100%) rename substrate/{ => substrate}/executor/src/lib.rs (97%) rename substrate/{ => substrate}/executor/src/native_executor.rs (96%) rename substrate/{ => substrate}/executor/src/wasm_executor.rs (99%) rename substrate/{ => substrate}/executor/src/wasm_utils.rs (100%) rename substrate/{ => substrate}/executor/wasm/Cargo.lock (100%) rename substrate/{ => substrate}/executor/wasm/Cargo.toml (100%) rename substrate/{ => substrate}/executor/wasm/build.sh (100%) rename substrate/{ => substrate}/executor/wasm/src/lib.rs (100%) rename substrate/{ => substrate}/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm (100%) create mode 100644 substrate/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.wasm rename substrate/{ => substrate}/primitives/Cargo.toml (100%) rename substrate/{ => substrate}/primitives/src/block.rs (100%) rename substrate/{ => substrate}/primitives/src/bytes.rs (100%) rename substrate/{ => substrate}/primitives/src/hash.rs (100%) rename substrate/{ => substrate}/primitives/src/hashing.rs (100%) rename substrate/{ => substrate}/primitives/src/hexdisplay.rs (100%) rename substrate/{ => substrate}/primitives/src/lib.rs (100%) rename substrate/{ => substrate}/primitives/src/storage.rs (100%) rename substrate/{ => substrate}/primitives/src/tests.rs (100%) rename substrate/{ => substrate}/primitives/src/uint.rs (100%) rename substrate/{ => substrate}/pwasm-alloc/Cargo.toml (100%) rename substrate/{ => substrate}/pwasm-alloc/README.md (100%) rename substrate/{ => substrate}/pwasm-alloc/build.rs (100%) rename substrate/{ => substrate}/pwasm-alloc/src/lib.rs (100%) rename substrate/{ => substrate}/pwasm-libc/Cargo.toml (100%) rename substrate/{ => substrate}/pwasm-libc/README.md (100%) rename substrate/{ => substrate}/pwasm-libc/src/lib.rs (100%) rename substrate/{ => substrate}/rpc-servers/Cargo.toml (100%) rename substrate/{ => substrate}/rpc-servers/src/lib.rs (100%) rename substrate/{ => substrate}/rpc/Cargo.toml (100%) rename substrate/{ => substrate}/rpc/src/chain/error.rs (100%) rename substrate/{ => substrate}/rpc/src/chain/mod.rs (100%) rename substrate/{ => substrate}/rpc/src/chain/tests.rs (100%) rename substrate/{ => substrate}/rpc/src/lib.rs (100%) rename substrate/{ => substrate}/rpc/src/state/error.rs (100%) rename substrate/{ => substrate}/rpc/src/state/mod.rs (100%) rename substrate/{ => substrate}/rpc/src/state/tests.rs (100%) rename substrate/{ => substrate}/runtime-io/Cargo.toml (100%) rename substrate/{ => substrate}/runtime-io/build.rs (100%) rename substrate/{ => substrate}/runtime-io/src/lib.rs (100%) rename substrate/{ => substrate}/runtime-io/with_std.rs (100%) rename substrate/{ => substrate}/runtime-io/without_std.rs (100%) rename substrate/{ => substrate}/runtime-std/Cargo.toml (100%) rename substrate/{ => substrate}/runtime-std/build.rs (100%) rename substrate/{ => substrate}/runtime-std/src/lib.rs (100%) rename substrate/{ => substrate}/runtime-std/with_std.rs (100%) rename substrate/{ => substrate}/runtime-std/without_std.rs (100%) rename substrate/{ => substrate}/serializer/Cargo.toml (100%) rename substrate/{ => substrate}/serializer/src/lib.rs (100%) rename substrate/{ => substrate}/state-machine/Cargo.toml (100%) rename substrate/{ => substrate}/state-machine/src/backend.rs (100%) rename substrate/{ => substrate}/state-machine/src/ext.rs (100%) rename substrate/{ => substrate}/state-machine/src/lib.rs (100%) rename substrate/{ => substrate}/state-machine/src/testing.rs (100%) diff --git a/substrate/.gitignore b/substrate/.gitignore index ea86b1eb14..9155c1d6e1 100644 --- a/substrate/.gitignore +++ b/substrate/.gitignore @@ -1,6 +1,6 @@ /target/ **/*.rs.bk *.swp -polkadot-runtime/wasm/target/ -executor/wasm/target/ +polkadot/runtime/wasm/target/ +substrate/executor/wasm/target/ **/._* diff --git a/substrate/Cargo.toml b/substrate/Cargo.toml index 615a00dc05..1c3d80e3c7 100644 --- a/substrate/Cargo.toml +++ b/substrate/Cargo.toml @@ -1,3 +1,7 @@ +[[bin]] +name = "polkadot" +path = "polkadot/src/main.rs" + [package] name = "polkadot" version = "0.1.0" @@ -5,34 +9,34 @@ authors = ["Parity Technologies "] [dependencies] error-chain = "0.11" -polkadot-cli = { path = "polkadot-cli", version = "0.1" } -polkadot-network = { path = "network" } +polkadot-cli = { path = "polkadot/cli" } +polkadot-network = { path = "polkadot/network" } [workspace] members = [ - "client", - "codec", - "environmental", - "executor", - "network", - "polkadot-candidate-agreement", - "polkadot-cli", - "polkadot-collator", - "polkadot-executor", - "polkadot-runtime", - "polkadot-primitives", - "polkadot-validator", - "primitives", - "rpc", - "rpc-servers", - "runtime-io", - "runtime-std", - "serializer", - "state-machine", + "substrate/client", + "substrate/codec", + "substrate/environmental", + "substrate/executor", + "polkadot/network", + "polkadot/candidate-agreement", + "polkadot/cli", + "polkadot/collator", + "polkadot/executor", + "polkadot/runtime", + "polkadot/primitives", + "polkadot/validator", + "substrate/primitives", + "substrate/rpc", + "substrate/rpc-servers", + "substrate/runtime-io", + "substrate/runtime-std", + "substrate/serializer", + "substrate/state-machine", ] exclude = [ - "executor/wasm", - "polkadot-runtime/wasm", - "pwasm-alloc", - "pwasm-libc", + "substrate/executor/wasm", + "polkadot/runtime/wasm", + "substrate/pwasm-alloc", + "substrate/pwasm-libc", ] diff --git a/substrate/polkadot-cli/Cargo.toml b/substrate/polkadot-cli/Cargo.toml deleted file mode 100644 index 6ab7915afb..0000000000 --- a/substrate/polkadot-cli/Cargo.toml +++ /dev/null @@ -1,24 +0,0 @@ -[package] -name = "polkadot-cli" -version = "0.1.0" -authors = ["Parity Technologies "] -description = "Polkadot node implementation in Rust." - -[dependencies] -clap = { version = "2.27", features = ["yaml"] } -env_logger = "0.4" -error-chain = "0.11" -log = "0.3" -hex-literal = "0.1" -ed25519 = { path = "../ed25519" } -triehash = { version = "0.1" } -substrate-client = { path = "../client" } -substrate-codec = { path = "../codec" } -substrate-runtime-io = { path = "../runtime-io" } -substrate-state-machine = { path = "../state-machine" } -substrate-executor = { path = "../executor" } -substrate-primitives = { path = "../primitives" } -substrate-rpc-servers = { path = "../rpc-servers" } -polkadot-primitives = { path = "../polkadot-primitives" } -polkadot-executor = { path = "../polkadot-executor" } -polkadot-runtime = { path = "../polkadot-runtime" } diff --git a/substrate/polkadot-executor/Cargo.toml b/substrate/polkadot-executor/Cargo.toml deleted file mode 100644 index fdab366062..0000000000 --- a/substrate/polkadot-executor/Cargo.toml +++ /dev/null @@ -1,17 +0,0 @@ -[package] -name = "polkadot-executor" -version = "0.1.0" -authors = ["Parity Technologies "] -description = "Polkadot node implementation in Rust." - -[dependencies] -hex-literal = "0.1" -ed25519 = { path = "../ed25519" } -triehash = { version = "0.1" } -substrate-codec = { path = "../codec" } -substrate-runtime-io = { path = "../runtime-io" } -substrate-state-machine = { path = "../state-machine" } -substrate-executor = { path = "../executor" } -substrate-primitives = { path = "../primitives" } -polkadot-primitives = { path = "../polkadot-primitives", version = "0.1" } -polkadot-runtime = { path = "../polkadot-runtime" } diff --git a/substrate/polkadot-runtime/Cargo.toml b/substrate/polkadot-runtime/Cargo.toml deleted file mode 100644 index 3bb02f1fbb..0000000000 --- a/substrate/polkadot-runtime/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "polkadot-runtime" -version = "0.1.0" -authors = ["Parity Technologies "] - -[dependencies] -substrate-codec = { path = "../codec", version = "0.1" } -substrate-runtime-std = { path = "../runtime-std", version = "0.1" } -substrate-runtime-io = { path = "../runtime-io", version = "0.1" } -substrate-primitives = { path = "../primitives", version = "0.1" } -polkadot-primitives = { path = "../polkadot-primitives", version = "0.1" } -rustc-hex = "1.0" -hex-literal = "0.1.0" -log = { version = "0.3", optional = true } - -[features] -default = ["std"] -std = ["substrate-codec/std", "substrate-runtime-std/std", "substrate-runtime-io/std", "substrate-primitives/std", "polkadot-primitives/std", "log"] diff --git a/substrate/polkadot-validator/Cargo.toml b/substrate/polkadot-validator/Cargo.toml deleted file mode 100644 index a95f6798ae..0000000000 --- a/substrate/polkadot-validator/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "polkadot-validator" -version = "0.1.0" -authors = ["Parity Technologies "] - -[dependencies] -error-chain = "0.11" -substrate-primitives = { path = "../primitives" } -polkadot-primitives = { path = "../polkadot-primitives" } -substrate-serializer = { path = "../serializer" } -serde = "1.0" diff --git a/substrate/polkadot-candidate-agreement/Cargo.toml b/substrate/polkadot/candidate-agreement/Cargo.toml similarity index 100% rename from substrate/polkadot-candidate-agreement/Cargo.toml rename to substrate/polkadot/candidate-agreement/Cargo.toml diff --git a/substrate/polkadot-candidate-agreement/src/bft/accumulator.rs b/substrate/polkadot/candidate-agreement/src/bft/accumulator.rs similarity index 100% rename from substrate/polkadot-candidate-agreement/src/bft/accumulator.rs rename to substrate/polkadot/candidate-agreement/src/bft/accumulator.rs diff --git a/substrate/polkadot-candidate-agreement/src/bft/mod.rs b/substrate/polkadot/candidate-agreement/src/bft/mod.rs similarity index 100% rename from substrate/polkadot-candidate-agreement/src/bft/mod.rs rename to substrate/polkadot/candidate-agreement/src/bft/mod.rs diff --git a/substrate/polkadot-candidate-agreement/src/bft/tests.rs b/substrate/polkadot/candidate-agreement/src/bft/tests.rs similarity index 100% rename from substrate/polkadot-candidate-agreement/src/bft/tests.rs rename to substrate/polkadot/candidate-agreement/src/bft/tests.rs diff --git a/substrate/polkadot-candidate-agreement/src/handle_incoming.rs b/substrate/polkadot/candidate-agreement/src/handle_incoming.rs similarity index 100% rename from substrate/polkadot-candidate-agreement/src/handle_incoming.rs rename to substrate/polkadot/candidate-agreement/src/handle_incoming.rs diff --git a/substrate/polkadot-candidate-agreement/src/lib.rs b/substrate/polkadot/candidate-agreement/src/lib.rs similarity index 100% rename from substrate/polkadot-candidate-agreement/src/lib.rs rename to substrate/polkadot/candidate-agreement/src/lib.rs diff --git a/substrate/polkadot-candidate-agreement/src/round_robin.rs b/substrate/polkadot/candidate-agreement/src/round_robin.rs similarity index 100% rename from substrate/polkadot-candidate-agreement/src/round_robin.rs rename to substrate/polkadot/candidate-agreement/src/round_robin.rs diff --git a/substrate/polkadot-candidate-agreement/src/table.rs b/substrate/polkadot/candidate-agreement/src/table.rs similarity index 100% rename from substrate/polkadot-candidate-agreement/src/table.rs rename to substrate/polkadot/candidate-agreement/src/table.rs diff --git a/substrate/polkadot-candidate-agreement/src/tests/mod.rs b/substrate/polkadot/candidate-agreement/src/tests/mod.rs similarity index 100% rename from substrate/polkadot-candidate-agreement/src/tests/mod.rs rename to substrate/polkadot/candidate-agreement/src/tests/mod.rs diff --git a/substrate/polkadot/cli/Cargo.toml b/substrate/polkadot/cli/Cargo.toml new file mode 100644 index 0000000000..4bb48abf2b --- /dev/null +++ b/substrate/polkadot/cli/Cargo.toml @@ -0,0 +1,24 @@ +[package] +name = "polkadot-cli" +version = "0.1.0" +authors = ["Parity Technologies "] +description = "Polkadot node implementation in Rust." + +[dependencies] +clap = { version = "2.27", features = ["yaml"] } +env_logger = "0.4" +error-chain = "0.11" +log = "0.3" +hex-literal = "0.1" +triehash = "0.1" +ed25519 = { path = "../../substrate/ed25519" } +substrate-client = { path = "../../substrate/client" } +substrate-codec = { path = "../../substrate/codec" } +substrate-runtime-io = { path = "../../substrate/runtime-io" } +substrate-state-machine = { path = "../../substrate/state-machine" } +substrate-executor = { path = "../../substrate/executor" } +substrate-primitives = { path = "../../substrate/primitives" } +substrate-rpc-servers = { path = "../../substrate/rpc-servers" } +polkadot-primitives = { path = "../primitives" } +polkadot-executor = { path = "../executor" } +polkadot-runtime = { path = "../runtime" } diff --git a/substrate/polkadot-cli/src/cli.yml b/substrate/polkadot/cli/src/cli.yml similarity index 100% rename from substrate/polkadot-cli/src/cli.yml rename to substrate/polkadot/cli/src/cli.yml diff --git a/substrate/polkadot-cli/src/error.rs b/substrate/polkadot/cli/src/error.rs similarity index 100% rename from substrate/polkadot-cli/src/error.rs rename to substrate/polkadot/cli/src/error.rs diff --git a/substrate/polkadot-cli/src/genesis.rs b/substrate/polkadot/cli/src/genesis.rs similarity index 100% rename from substrate/polkadot-cli/src/genesis.rs rename to substrate/polkadot/cli/src/genesis.rs diff --git a/substrate/polkadot-cli/src/lib.rs b/substrate/polkadot/cli/src/lib.rs similarity index 100% rename from substrate/polkadot-cli/src/lib.rs rename to substrate/polkadot/cli/src/lib.rs diff --git a/substrate/polkadot-collator/Cargo.toml b/substrate/polkadot/collator/Cargo.toml similarity index 56% rename from substrate/polkadot-collator/Cargo.toml rename to substrate/polkadot/collator/Cargo.toml index e4a91cab66..6f1fa16302 100644 --- a/substrate/polkadot-collator/Cargo.toml +++ b/substrate/polkadot/collator/Cargo.toml @@ -5,6 +5,6 @@ authors = ["Parity Technologies "] description = "Abstract collation logic" [dependencies] -substrate-primitives = { path = "../primitives", version = "0.1" } -polkadot-primitives = { path = "../polkadot-primitives", version = "0.1" } futures = "0.1.17" +substrate-primitives = { path = "../../substrate/primitives", version = "0.1" } +polkadot-primitives = { path = "../primitives", version = "0.1" } diff --git a/substrate/polkadot-collator/src/lib.rs b/substrate/polkadot/collator/src/lib.rs similarity index 100% rename from substrate/polkadot-collator/src/lib.rs rename to substrate/polkadot/collator/src/lib.rs diff --git a/substrate/polkadot/executor/Cargo.toml b/substrate/polkadot/executor/Cargo.toml new file mode 100644 index 0000000000..2c268ad51d --- /dev/null +++ b/substrate/polkadot/executor/Cargo.toml @@ -0,0 +1,17 @@ +[package] +name = "polkadot-executor" +version = "0.1.0" +authors = ["Parity Technologies "] +description = "Polkadot node implementation in Rust." + +[dependencies] +hex-literal = "0.1" +triehash = { version = "0.1" } +ed25519 = { path = "../../substrate/ed25519" } +substrate-codec = { path = "../../substrate/codec" } +substrate-runtime-io = { path = "../../substrate/runtime-io" } +substrate-state-machine = { path = "../../substrate/state-machine" } +substrate-executor = { path = "../../substrate/executor" } +substrate-primitives = { path = "../../substrate/primitives" } +polkadot-primitives = { path = "../primitives" } +polkadot-runtime = { path = "../runtime" } diff --git a/substrate/polkadot-executor/src/lib.rs b/substrate/polkadot/executor/src/lib.rs similarity index 93% rename from substrate/polkadot-executor/src/lib.rs rename to substrate/polkadot/executor/src/lib.rs index 0c6c0fb37e..1c2ec994b6 100644 --- a/substrate/polkadot-executor/src/lib.rs +++ b/substrate/polkadot/executor/src/lib.rs @@ -40,7 +40,7 @@ impl NativeExecutionDispatch for LocalNativeExecutionDispatch { fn native_equivalent() -> &'static [u8] { // WARNING!!! This assumes that the runtime was built *before* the main project. Until we // get a proper build script, this must be strictly adhered to or things will go wrong. - include_bytes!("../../polkadot-runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm") + include_bytes!("../../runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm") } fn dispatch(method: &str, data: &[u8]) -> Option> { @@ -67,8 +67,8 @@ mod tests { UncheckedTransaction, Function, AccountId}; use ed25519::Pair; - const BLOATY_CODE: &[u8] = include_bytes!("../../polkadot-runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm"); - const COMPACT_CODE: &[u8] = include_bytes!("../../polkadot-runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm"); + const BLOATY_CODE: &[u8] = include_bytes!("../../runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm"); + const COMPACT_CODE: &[u8] = include_bytes!("../../runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm"); // TODO: move into own crate. macro_rules! map { @@ -289,7 +289,7 @@ mod tests { twox_128(&one.to_keyed_vec(b"sta:bal:")).to_vec() => vec![68u8, 0, 0, 0, 0, 0, 0, 0] ], }; - let foreign_code = include_bytes!("../../polkadot-runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm"); + let foreign_code = include_bytes!("../../runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm"); let r = WasmExecutor.call(&mut t, &foreign_code[..], "execute_transaction", &vec![].join(&Header::from_block_number(1u64)).join(&tx())); assert!(r.is_err()); } @@ -303,7 +303,7 @@ mod tests { twox_128(&one.to_keyed_vec(b"sta:bal:")).to_vec() => vec![111u8, 0, 0, 0, 0, 0, 0, 0] ], }; - let foreign_code = include_bytes!("../../polkadot-runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm"); + let foreign_code = include_bytes!("../../runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm"); let r = WasmExecutor.call(&mut t, &foreign_code[..], "execute_transaction", &vec![].join(&Header::from_block_number(1u64)).join(&tx())); assert!(r.is_ok()); diff --git a/substrate/network/Cargo.toml b/substrate/polkadot/network/Cargo.toml similarity index 66% rename from substrate/network/Cargo.toml rename to substrate/polkadot/network/Cargo.toml index 39e88c97db..e016be7d30 100644 --- a/substrate/network/Cargo.toml +++ b/substrate/polkadot/network/Cargo.toml @@ -8,12 +8,6 @@ authors = ["Parity Technologies "] [lib] [dependencies] -ethcore-network = { git = "https://github.com/paritytech/parity.git" } -ethcore-io = { git = "https://github.com/paritytech/parity.git" } -substrate-primitives = { path = "../primitives" } -substrate-client = { path = "../client" } -substrate-state-machine = { path = "../state-machine" } -substrate-serializer = { path = "../serializer" } log = "0.3" env_logger = "0.4" rand = "0.3" @@ -27,4 +21,10 @@ bitflags = "1.0" serde = "1.0" serde_derive = "1.0" serde_json = "1.0" -polkadot-primitives = { path = "../polkadot-primitives" } +ethcore-network = { git = "https://github.com/paritytech/parity.git" } +ethcore-io = { git = "https://github.com/paritytech/parity.git" } +substrate-primitives = { path = "../../substrate/primitives" } +substrate-client = { path = "../../substrate/client" } +substrate-state-machine = { path = "../../substrate/state-machine" } +substrate-serializer = { path = "../../substrate/serializer" } +polkadot-primitives = { path = "../primitives" } diff --git a/substrate/network/src/blocks.rs b/substrate/polkadot/network/src/blocks.rs similarity index 100% rename from substrate/network/src/blocks.rs rename to substrate/polkadot/network/src/blocks.rs diff --git a/substrate/network/src/chain.rs b/substrate/polkadot/network/src/chain.rs similarity index 100% rename from substrate/network/src/chain.rs rename to substrate/polkadot/network/src/chain.rs diff --git a/substrate/network/src/config.rs b/substrate/polkadot/network/src/config.rs similarity index 100% rename from substrate/network/src/config.rs rename to substrate/polkadot/network/src/config.rs diff --git a/substrate/network/src/error.rs b/substrate/polkadot/network/src/error.rs similarity index 100% rename from substrate/network/src/error.rs rename to substrate/polkadot/network/src/error.rs diff --git a/substrate/network/src/io.rs b/substrate/polkadot/network/src/io.rs similarity index 100% rename from substrate/network/src/io.rs rename to substrate/polkadot/network/src/io.rs diff --git a/substrate/network/src/lib.rs b/substrate/polkadot/network/src/lib.rs similarity index 100% rename from substrate/network/src/lib.rs rename to substrate/polkadot/network/src/lib.rs diff --git a/substrate/network/src/message.rs b/substrate/polkadot/network/src/message.rs similarity index 100% rename from substrate/network/src/message.rs rename to substrate/polkadot/network/src/message.rs diff --git a/substrate/network/src/protocol.rs b/substrate/polkadot/network/src/protocol.rs similarity index 100% rename from substrate/network/src/protocol.rs rename to substrate/polkadot/network/src/protocol.rs diff --git a/substrate/network/src/service.rs b/substrate/polkadot/network/src/service.rs similarity index 100% rename from substrate/network/src/service.rs rename to substrate/polkadot/network/src/service.rs diff --git a/substrate/network/src/sync.rs b/substrate/polkadot/network/src/sync.rs similarity index 100% rename from substrate/network/src/sync.rs rename to substrate/polkadot/network/src/sync.rs diff --git a/substrate/network/src/test/mod.rs b/substrate/polkadot/network/src/test/mod.rs similarity index 100% rename from substrate/network/src/test/mod.rs rename to substrate/polkadot/network/src/test/mod.rs diff --git a/substrate/polkadot-primitives/Cargo.toml b/substrate/polkadot/primitives/Cargo.toml similarity index 57% rename from substrate/polkadot-primitives/Cargo.toml rename to substrate/polkadot/primitives/Cargo.toml index dde8e9d476..ec2433c9a7 100644 --- a/substrate/polkadot-primitives/Cargo.toml +++ b/substrate/polkadot/primitives/Cargo.toml @@ -6,12 +6,12 @@ authors = ["Parity Technologies "] [dependencies] serde = { version = "1.0", default_features = false } serde_derive = { version = "1.0", optional = true } -substrate-codec = { path = "../codec", default_features = false } -substrate-primitives = { path = "../primitives", default_features = false } -substrate-runtime-std = { path = "../runtime-std", default_features = false } +substrate-codec = { path = "../../substrate/codec", default_features = false } +substrate-primitives = { path = "../../substrate/primitives", default_features = false } +substrate-runtime-std = { path = "../../substrate/runtime-std", default_features = false } [dev-dependencies] -substrate-serializer = { path = "../serializer" } +substrate-serializer = { path = "../../substrate/serializer" } pretty_assertions = "0.4" [features] diff --git a/substrate/polkadot-primitives/src/block.rs b/substrate/polkadot/primitives/src/block.rs similarity index 100% rename from substrate/polkadot-primitives/src/block.rs rename to substrate/polkadot/primitives/src/block.rs diff --git a/substrate/polkadot-primitives/src/lib.rs b/substrate/polkadot/primitives/src/lib.rs similarity index 100% rename from substrate/polkadot-primitives/src/lib.rs rename to substrate/polkadot/primitives/src/lib.rs diff --git a/substrate/polkadot-primitives/src/parachain.rs b/substrate/polkadot/primitives/src/parachain.rs similarity index 100% rename from substrate/polkadot-primitives/src/parachain.rs rename to substrate/polkadot/primitives/src/parachain.rs diff --git a/substrate/polkadot-primitives/src/transaction.rs b/substrate/polkadot/primitives/src/transaction.rs similarity index 100% rename from substrate/polkadot-primitives/src/transaction.rs rename to substrate/polkadot/primitives/src/transaction.rs diff --git a/substrate/polkadot-primitives/src/validator.rs b/substrate/polkadot/primitives/src/validator.rs similarity index 100% rename from substrate/polkadot-primitives/src/validator.rs rename to substrate/polkadot/primitives/src/validator.rs diff --git a/substrate/polkadot/runtime/Cargo.toml b/substrate/polkadot/runtime/Cargo.toml new file mode 100644 index 0000000000..d3b3cfb34f --- /dev/null +++ b/substrate/polkadot/runtime/Cargo.toml @@ -0,0 +1,25 @@ +[package] +name = "polkadot-runtime" +version = "0.1.0" +authors = ["Parity Technologies "] + +[dependencies] +rustc-hex = "1.0" +hex-literal = "0.1.0" +log = { version = "0.3", optional = true } +substrate-codec = { path = "../../substrate/codec" } +substrate-runtime-std = { path = "../../substrate/runtime-std" } +substrate-runtime-io = { path = "../../substrate/runtime-io" } +substrate-primitives = { path = "../../substrate/primitives" } +polkadot-primitives = { path = "../primitives" } + +[features] +default = ["std"] +std = [ + "substrate-codec/std", + "substrate-runtime-std/std", + "substrate-runtime-io/std", + "substrate-primitives/std", + "polkadot-primitives/std", + "log" +] diff --git a/substrate/polkadot-runtime/src/genesismap.rs b/substrate/polkadot/runtime/src/genesismap.rs similarity index 100% rename from substrate/polkadot-runtime/src/genesismap.rs rename to substrate/polkadot/runtime/src/genesismap.rs diff --git a/substrate/polkadot-runtime/src/lib.rs b/substrate/polkadot/runtime/src/lib.rs similarity index 100% rename from substrate/polkadot-runtime/src/lib.rs rename to substrate/polkadot/runtime/src/lib.rs diff --git a/substrate/polkadot-runtime/src/runtime/consensus.rs b/substrate/polkadot/runtime/src/runtime/consensus.rs similarity index 100% rename from substrate/polkadot-runtime/src/runtime/consensus.rs rename to substrate/polkadot/runtime/src/runtime/consensus.rs diff --git a/substrate/polkadot-runtime/src/runtime/governance.rs b/substrate/polkadot/runtime/src/runtime/governance.rs similarity index 100% rename from substrate/polkadot-runtime/src/runtime/governance.rs rename to substrate/polkadot/runtime/src/runtime/governance.rs diff --git a/substrate/polkadot-runtime/src/runtime/mod.rs b/substrate/polkadot/runtime/src/runtime/mod.rs similarity index 100% rename from substrate/polkadot-runtime/src/runtime/mod.rs rename to substrate/polkadot/runtime/src/runtime/mod.rs diff --git a/substrate/polkadot-runtime/src/runtime/parachains.rs b/substrate/polkadot/runtime/src/runtime/parachains.rs similarity index 100% rename from substrate/polkadot-runtime/src/runtime/parachains.rs rename to substrate/polkadot/runtime/src/runtime/parachains.rs diff --git a/substrate/polkadot-runtime/src/runtime/session.rs b/substrate/polkadot/runtime/src/runtime/session.rs similarity index 100% rename from substrate/polkadot-runtime/src/runtime/session.rs rename to substrate/polkadot/runtime/src/runtime/session.rs diff --git a/substrate/polkadot-runtime/src/runtime/staking.rs b/substrate/polkadot/runtime/src/runtime/staking.rs similarity index 100% rename from substrate/polkadot-runtime/src/runtime/staking.rs rename to substrate/polkadot/runtime/src/runtime/staking.rs diff --git a/substrate/polkadot-runtime/src/runtime/system.rs b/substrate/polkadot/runtime/src/runtime/system.rs similarity index 100% rename from substrate/polkadot-runtime/src/runtime/system.rs rename to substrate/polkadot/runtime/src/runtime/system.rs diff --git a/substrate/polkadot-runtime/src/runtime/timestamp.rs b/substrate/polkadot/runtime/src/runtime/timestamp.rs similarity index 100% rename from substrate/polkadot-runtime/src/runtime/timestamp.rs rename to substrate/polkadot/runtime/src/runtime/timestamp.rs diff --git a/substrate/polkadot-runtime/src/support/environment.rs b/substrate/polkadot/runtime/src/support/environment.rs similarity index 100% rename from substrate/polkadot-runtime/src/support/environment.rs rename to substrate/polkadot/runtime/src/support/environment.rs diff --git a/substrate/polkadot-runtime/src/support/hashable.rs b/substrate/polkadot/runtime/src/support/hashable.rs similarity index 100% rename from substrate/polkadot-runtime/src/support/hashable.rs rename to substrate/polkadot/runtime/src/support/hashable.rs diff --git a/substrate/polkadot-runtime/src/support/mod.rs b/substrate/polkadot/runtime/src/support/mod.rs similarity index 100% rename from substrate/polkadot-runtime/src/support/mod.rs rename to substrate/polkadot/runtime/src/support/mod.rs diff --git a/substrate/polkadot-runtime/src/support/statichex.rs b/substrate/polkadot/runtime/src/support/statichex.rs similarity index 100% rename from substrate/polkadot-runtime/src/support/statichex.rs rename to substrate/polkadot/runtime/src/support/statichex.rs diff --git a/substrate/polkadot-runtime/src/support/storage.rs b/substrate/polkadot/runtime/src/support/storage.rs similarity index 100% rename from substrate/polkadot-runtime/src/support/storage.rs rename to substrate/polkadot/runtime/src/support/storage.rs diff --git a/substrate/polkadot-runtime/src/support/testing.rs b/substrate/polkadot/runtime/src/support/testing.rs similarity index 100% rename from substrate/polkadot-runtime/src/support/testing.rs rename to substrate/polkadot/runtime/src/support/testing.rs diff --git a/substrate/polkadot-runtime/wasm/Cargo.lock b/substrate/polkadot/runtime/wasm/Cargo.lock similarity index 100% rename from substrate/polkadot-runtime/wasm/Cargo.lock rename to substrate/polkadot/runtime/wasm/Cargo.lock diff --git a/substrate/polkadot-runtime/wasm/Cargo.toml b/substrate/polkadot/runtime/wasm/Cargo.toml similarity index 100% rename from substrate/polkadot-runtime/wasm/Cargo.toml rename to substrate/polkadot/runtime/wasm/Cargo.toml diff --git a/substrate/polkadot-runtime/wasm/build.sh b/substrate/polkadot/runtime/wasm/build.sh similarity index 100% rename from substrate/polkadot-runtime/wasm/build.sh rename to substrate/polkadot/runtime/wasm/build.sh diff --git a/substrate/polkadot-runtime/wasm/genesis.wasm b/substrate/polkadot/runtime/wasm/genesis.wasm similarity index 100% rename from substrate/polkadot-runtime/wasm/genesis.wasm rename to substrate/polkadot/runtime/wasm/genesis.wasm diff --git a/substrate/polkadot-runtime/wasm/init.sh b/substrate/polkadot/runtime/wasm/init.sh similarity index 100% rename from substrate/polkadot-runtime/wasm/init.sh rename to substrate/polkadot/runtime/wasm/init.sh diff --git a/substrate/polkadot-runtime/wasm/src b/substrate/polkadot/runtime/wasm/src similarity index 100% rename from substrate/polkadot-runtime/wasm/src rename to substrate/polkadot/runtime/wasm/src diff --git a/substrate/polkadot-runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm b/substrate/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm similarity index 100% rename from substrate/polkadot-runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm rename to substrate/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm diff --git a/substrate/polkadot-runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm b/substrate/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm similarity index 100% rename from substrate/polkadot-runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm rename to substrate/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm diff --git a/substrate/src/main.rs b/substrate/polkadot/src/main.rs similarity index 100% rename from substrate/src/main.rs rename to substrate/polkadot/src/main.rs diff --git a/substrate/polkadot/validator/Cargo.toml b/substrate/polkadot/validator/Cargo.toml new file mode 100644 index 0000000000..204c356a99 --- /dev/null +++ b/substrate/polkadot/validator/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "polkadot-validator" +version = "0.1.0" +authors = ["Parity Technologies "] + +[dependencies] +error-chain = "0.11" +serde = "1.0" +substrate-primitives = { path = "../../substrate/primitives" } +substrate-serializer = { path = "../../substrate/serializer" } +polkadot-primitives = { path = "../primitives" } diff --git a/substrate/polkadot-validator/src/error.rs b/substrate/polkadot/validator/src/error.rs similarity index 100% rename from substrate/polkadot-validator/src/error.rs rename to substrate/polkadot/validator/src/error.rs diff --git a/substrate/polkadot-validator/src/lib.rs b/substrate/polkadot/validator/src/lib.rs similarity index 100% rename from substrate/polkadot-validator/src/lib.rs rename to substrate/polkadot/validator/src/lib.rs diff --git a/substrate/polkadot-validator/src/parachains.rs b/substrate/polkadot/validator/src/parachains.rs similarity index 100% rename from substrate/polkadot-validator/src/parachains.rs rename to substrate/polkadot/validator/src/parachains.rs diff --git a/substrate/polkadot-validator/src/validator.rs b/substrate/polkadot/validator/src/validator.rs similarity index 100% rename from substrate/polkadot-validator/src/validator.rs rename to substrate/polkadot/validator/src/validator.rs diff --git a/substrate/client/Cargo.toml b/substrate/substrate/client/Cargo.toml similarity index 100% rename from substrate/client/Cargo.toml rename to substrate/substrate/client/Cargo.toml diff --git a/substrate/client/src/backend.rs b/substrate/substrate/client/src/backend.rs similarity index 100% rename from substrate/client/src/backend.rs rename to substrate/substrate/client/src/backend.rs diff --git a/substrate/client/src/blockchain.rs b/substrate/substrate/client/src/blockchain.rs similarity index 100% rename from substrate/client/src/blockchain.rs rename to substrate/substrate/client/src/blockchain.rs diff --git a/substrate/client/src/error.rs b/substrate/substrate/client/src/error.rs similarity index 100% rename from substrate/client/src/error.rs rename to substrate/substrate/client/src/error.rs diff --git a/substrate/client/src/in_mem.rs b/substrate/substrate/client/src/in_mem.rs similarity index 100% rename from substrate/client/src/in_mem.rs rename to substrate/substrate/client/src/in_mem.rs diff --git a/substrate/client/src/lib.rs b/substrate/substrate/client/src/lib.rs similarity index 100% rename from substrate/client/src/lib.rs rename to substrate/substrate/client/src/lib.rs diff --git a/substrate/codec/Cargo.toml b/substrate/substrate/codec/Cargo.toml similarity index 100% rename from substrate/codec/Cargo.toml rename to substrate/substrate/codec/Cargo.toml diff --git a/substrate/codec/src/endiansensitive.rs b/substrate/substrate/codec/src/endiansensitive.rs similarity index 100% rename from substrate/codec/src/endiansensitive.rs rename to substrate/substrate/codec/src/endiansensitive.rs diff --git a/substrate/codec/src/joiner.rs b/substrate/substrate/codec/src/joiner.rs similarity index 100% rename from substrate/codec/src/joiner.rs rename to substrate/substrate/codec/src/joiner.rs diff --git a/substrate/codec/src/keyedvec.rs b/substrate/substrate/codec/src/keyedvec.rs similarity index 100% rename from substrate/codec/src/keyedvec.rs rename to substrate/substrate/codec/src/keyedvec.rs diff --git a/substrate/codec/src/lib.rs b/substrate/substrate/codec/src/lib.rs similarity index 100% rename from substrate/codec/src/lib.rs rename to substrate/substrate/codec/src/lib.rs diff --git a/substrate/codec/src/slicable.rs b/substrate/substrate/codec/src/slicable.rs similarity index 100% rename from substrate/codec/src/slicable.rs rename to substrate/substrate/codec/src/slicable.rs diff --git a/substrate/ed25519/Cargo.toml b/substrate/substrate/ed25519/Cargo.toml similarity index 100% rename from substrate/ed25519/Cargo.toml rename to substrate/substrate/ed25519/Cargo.toml diff --git a/substrate/ed25519/src/lib.rs b/substrate/substrate/ed25519/src/lib.rs similarity index 100% rename from substrate/ed25519/src/lib.rs rename to substrate/substrate/ed25519/src/lib.rs diff --git a/substrate/environmental/Cargo.toml b/substrate/substrate/environmental/Cargo.toml similarity index 100% rename from substrate/environmental/Cargo.toml rename to substrate/substrate/environmental/Cargo.toml diff --git a/substrate/environmental/src/lib.rs b/substrate/substrate/environmental/src/lib.rs similarity index 100% rename from substrate/environmental/src/lib.rs rename to substrate/substrate/environmental/src/lib.rs diff --git a/substrate/executor/Cargo.toml b/substrate/substrate/executor/Cargo.toml similarity index 100% rename from substrate/executor/Cargo.toml rename to substrate/substrate/executor/Cargo.toml diff --git a/substrate/executor/src/error.rs b/substrate/substrate/executor/src/error.rs similarity index 100% rename from substrate/executor/src/error.rs rename to substrate/substrate/executor/src/error.rs diff --git a/substrate/executor/src/lib.rs b/substrate/substrate/executor/src/lib.rs similarity index 97% rename from substrate/executor/src/lib.rs rename to substrate/substrate/executor/src/lib.rs index 44656fab5b..266373f2b2 100644 --- a/substrate/executor/src/lib.rs +++ b/substrate/substrate/executor/src/lib.rs @@ -41,10 +41,6 @@ extern crate rustc_hex; extern crate triehash; #[macro_use] extern crate log; -#[cfg(test)] -#[macro_use] -extern crate hex_literal; - #[macro_use] extern crate error_chain; diff --git a/substrate/executor/src/native_executor.rs b/substrate/substrate/executor/src/native_executor.rs similarity index 96% rename from substrate/executor/src/native_executor.rs rename to substrate/substrate/executor/src/native_executor.rs index e7c9258063..0ee6a66864 100644 --- a/substrate/executor/src/native_executor.rs +++ b/substrate/substrate/executor/src/native_executor.rs @@ -34,6 +34,7 @@ pub trait NativeExecutionDispatch { /// A generic `CodeExecutor` implementation that uses a delegate to determine wasm code equivalence /// and dispatch to native code when possible, falling back on `WasmExecutor` when not. pub struct NativeExecutor { + /// Dummy field to avoid the compiler complaining about us not using `D`. pub _dummy: ::std::marker::PhantomData, } diff --git a/substrate/executor/src/wasm_executor.rs b/substrate/substrate/executor/src/wasm_executor.rs similarity index 99% rename from substrate/executor/src/wasm_executor.rs rename to substrate/substrate/executor/src/wasm_executor.rs index 0a61a5b099..e9ed255f19 100644 --- a/substrate/executor/src/wasm_executor.rs +++ b/substrate/substrate/executor/src/wasm_executor.rs @@ -330,11 +330,9 @@ impl CodeExecutor for WasmExecutor { mod tests { use super::*; use rustc_hex::FromHex; - use codec::{KeyedVec, Slicable, Joiner}; + use codec::{Slicable, Joiner}; use state_machine::TestExternalities; - use primitives::{twox_128, Header}; - use runtime_io; - use ed25519::Pair; + use primitives::Header; #[test] fn returning_should_work() { diff --git a/substrate/executor/src/wasm_utils.rs b/substrate/substrate/executor/src/wasm_utils.rs similarity index 100% rename from substrate/executor/src/wasm_utils.rs rename to substrate/substrate/executor/src/wasm_utils.rs diff --git a/substrate/executor/wasm/Cargo.lock b/substrate/substrate/executor/wasm/Cargo.lock similarity index 100% rename from substrate/executor/wasm/Cargo.lock rename to substrate/substrate/executor/wasm/Cargo.lock diff --git a/substrate/executor/wasm/Cargo.toml b/substrate/substrate/executor/wasm/Cargo.toml similarity index 100% rename from substrate/executor/wasm/Cargo.toml rename to substrate/substrate/executor/wasm/Cargo.toml diff --git a/substrate/executor/wasm/build.sh b/substrate/substrate/executor/wasm/build.sh similarity index 100% rename from substrate/executor/wasm/build.sh rename to substrate/substrate/executor/wasm/build.sh diff --git a/substrate/executor/wasm/src/lib.rs b/substrate/substrate/executor/wasm/src/lib.rs similarity index 100% rename from substrate/executor/wasm/src/lib.rs rename to substrate/substrate/executor/wasm/src/lib.rs diff --git a/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm b/substrate/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm similarity index 100% rename from substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm rename to substrate/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm diff --git a/substrate/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.wasm b/substrate/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.wasm new file mode 100644 index 0000000000000000000000000000000000000000..b3e3b8389158fdd46669b05e916da8b65b536052 GIT binary patch literal 14116 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