diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock index 24234565d2..b84562b8a9 100644 --- a/substrate/Cargo.lock +++ b/substrate/Cargo.lock @@ -827,10 +827,10 @@ version = "0.1.0" dependencies = [ "hex-literal 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "polkadot-codec 0.1.0", "polkadot-primitives 0.1.0", "polkadot-runtime-std 0.1.0", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-codec 0.1.0", ] [[package]] @@ -988,9 +988,9 @@ dependencies = [ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "polkadot-client 0.1.0", - "polkadot-executor 0.1.0", "polkadot-primitives 0.1.0", "polkadot-rpc-servers 0.1.0", + "substrate-executor 0.1.0", ] [[package]] @@ -1003,18 +1003,14 @@ dependencies = [ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "native-runtime 0.1.0", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "polkadot-codec 0.1.0", - "polkadot-executor 0.1.0", "polkadot-primitives 0.1.0", "polkadot-serializer 0.1.0", "polkadot-state-machine 0.1.0", + "substrate-codec 0.1.0", + "substrate-executor 0.1.0", "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "polkadot-codec" -version = "0.1.0" - [[package]] name = "polkadot-collator" version = "0.1.0" @@ -1023,29 +1019,6 @@ dependencies = [ "polkadot-primitives 0.1.0", ] -[[package]] -name = "polkadot-executor" -version = "0.1.0" -dependencies = [ - "assert_matches 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ed25519 0.1.0", - "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hex-literal 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "native-runtime 0.1.0", - "parity-wasm 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)", - "polkadot-codec 0.1.0", - "polkadot-primitives 0.1.0", - "polkadot-runtime-std 0.1.0", - "polkadot-serializer 0.1.0", - "polkadot-state-machine 0.1.0", - "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", - "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "polkadot-network" version = "0.1.0" @@ -1079,12 +1052,12 @@ dependencies = [ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "fixed-hash 0.1.3 (git+https://github.com/rphmeier/primitives.git?branch=compile-for-wasm)", - "polkadot-codec 0.1.0", "polkadot-serializer 0.1.0", "pretty_assertions 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.0 (git+https://github.com/rphmeier/rustc-hex.git)", "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-codec 0.1.0", "twox-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "uint 0.1.2 (git+https://github.com/rphmeier/primitives.git?branch=compile-for-wasm)", ] @@ -1098,9 +1071,9 @@ dependencies = [ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git)", "jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git)", "polkadot-client 0.1.0", - "polkadot-executor 0.1.0", "polkadot-primitives 0.1.0", "polkadot-state-machine 0.1.0", + "substrate-executor 0.1.0", ] [[package]] @@ -1118,12 +1091,12 @@ version = "0.1.0" dependencies = [ "ed25519 0.1.0", "environmental 0.1.0", - "polkadot-codec 0.1.0", "polkadot-primitives 0.1.0", "polkadot-state-machine 0.1.0", "pwasm-alloc 0.1.0", "pwasm-libc 0.1.0", "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-codec 0.1.0", "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1475,6 +1448,33 @@ name = "strsim" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "substrate-codec" +version = "0.1.0" + +[[package]] +name = "substrate-executor" +version = "0.1.0" +dependencies = [ + "assert_matches 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ed25519 0.1.0", + "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hex-literal 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "native-runtime 0.1.0", + "parity-wasm 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)", + "polkadot-primitives 0.1.0", + "polkadot-runtime-std 0.1.0", + "polkadot-serializer 0.1.0", + "polkadot-state-machine 0.1.0", + "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-codec 0.1.0", + "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "subtle" version = "0.1.0" diff --git a/substrate/cli/Cargo.toml b/substrate/cli/Cargo.toml index 6d857023f7..6ad69c3717 100644 --- a/substrate/cli/Cargo.toml +++ b/substrate/cli/Cargo.toml @@ -9,7 +9,7 @@ clap = { version = "2.27", features = ["yaml"] } env_logger = "0.4" error-chain = "0.11" 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-client = { path = "../client" } +substrate-executor = { path = "../executor" } +polkadot-primitives = { path = "../primitives" } +polkadot-rpc-servers = { path = "../rpc-servers" } diff --git a/substrate/cli/src/lib.rs b/substrate/cli/src/lib.rs index d396a7c69e..db6ba224ad 100644 --- a/substrate/cli/src/lib.rs +++ b/substrate/cli/src/lib.rs @@ -20,7 +20,7 @@ extern crate env_logger; extern crate polkadot_client as client; -extern crate polkadot_executor as executor; +extern crate substrate_executor as executor; extern crate polkadot_primitives as primitives; extern crate polkadot_rpc_servers as rpc; diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml index 7fe9621de7..ef2f85f082 100644 --- a/substrate/client/Cargo.toml +++ b/substrate/client/Cargo.toml @@ -10,8 +10,8 @@ parking_lot = "0.4" polkadot-primitives = { path = "../primitives", version = "0.1" } polkadot-state-machine = { path = "../state-machine", version = "0.1" } polkadot-serializer = { path = "../serializer" } -polkadot-executor = { path = "../executor" } -polkadot-codec = { path = "../codec", version = "0.1" } +substrate-executor = { path = "../executor" } +substrate-codec = { path = "../codec", version = "0.1" } native-runtime = { path = "../native-runtime" } triehash = "0.1" hex-literal = "0.1" diff --git a/substrate/client/src/genesis.rs b/substrate/client/src/genesis.rs index a288bec4e5..1e2020b9a7 100644 --- a/substrate/client/src/genesis.rs +++ b/substrate/client/src/genesis.rs @@ -45,7 +45,7 @@ mod tests { use state_machine::execute; use state_machine::OverlayedChanges; use state_machine::backend::InMemory; - use polkadot_executor::executor; + use substrate_executor::executor; use primitives::relay::{AccountId, Hash, BlockNumber, Header, Digest, UncheckedTransaction, Transaction, Function}; use primitives::contract::CallData; diff --git a/substrate/client/src/lib.rs b/substrate/client/src/lib.rs index e97c93dd39..b53ca407ab 100644 --- a/substrate/client/src/lib.rs +++ b/substrate/client/src/lib.rs @@ -21,8 +21,8 @@ extern crate polkadot_primitives as primitives; extern crate polkadot_state_machine as state_machine; extern crate polkadot_serializer as ser; -extern crate polkadot_codec as codec; -extern crate polkadot_executor; +extern crate substrate_codec as codec; +extern crate substrate_executor; extern crate native_runtime; extern crate ed25519; diff --git a/substrate/codec/Cargo.toml b/substrate/codec/Cargo.toml index 0cf0083d5f..c780c9bd63 100644 --- a/substrate/codec/Cargo.toml +++ b/substrate/codec/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "polkadot-codec" +name = "substrate-codec" description = "Serialization and deserialization codec for runtime values" version = "0.1.0" authors = ["Parity Technologies "] diff --git a/substrate/codec/src/endiansensitive.rs b/substrate/codec/src/endiansensitive.rs index 1b550edffa..00ff9a775f 100644 --- a/substrate/codec/src/endiansensitive.rs +++ b/substrate/codec/src/endiansensitive.rs @@ -1,18 +1,18 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . //! Endian manager. diff --git a/substrate/codec/src/joiner.rs b/substrate/codec/src/joiner.rs index 1d19851243..ac85331012 100644 --- a/substrate/codec/src/joiner.rs +++ b/substrate/codec/src/joiner.rs @@ -1,18 +1,18 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . //! Trait diff --git a/substrate/codec/src/keyedvec.rs b/substrate/codec/src/keyedvec.rs index 2b4bc99fbd..535a616e14 100644 --- a/substrate/codec/src/keyedvec.rs +++ b/substrate/codec/src/keyedvec.rs @@ -1,18 +1,18 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . //! Serialiser and prepender. diff --git a/substrate/codec/src/slicable.rs b/substrate/codec/src/slicable.rs index 1d76fb851e..6baa2ebaad 100644 --- a/substrate/codec/src/slicable.rs +++ b/substrate/codec/src/slicable.rs @@ -1,18 +1,18 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . //! Serialisation. diff --git a/substrate/ed25519/src/lib.rs b/substrate/ed25519/src/lib.rs index 7f0bfae0ff..33c25895b7 100644 --- a/substrate/ed25519/src/lib.rs +++ b/substrate/ed25519/src/lib.rs @@ -1,18 +1,18 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . //! Simple Ed25519 API. diff --git a/substrate/executor/Cargo.toml b/substrate/executor/Cargo.toml index d51522c568..64625e760f 100644 --- a/substrate/executor/Cargo.toml +++ b/substrate/executor/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "polkadot-executor" +name = "substrate-executor" version = "0.1.0" authors = ["Parity Technologies "] [dependencies] error-chain = "0.11" -polkadot-codec = { path = "../codec", version = "0.1" } +substrate-codec = { path = "../codec", version = "0.1" } polkadot-runtime-std = { path = "../runtime-std", version = "0.1" } polkadot-primitives = { path = "../primitives", version = "0.1" } polkadot-serializer = { path = "../serializer", version = "0.1" } diff --git a/substrate/executor/src/error.rs b/substrate/executor/src/error.rs index 973fa58d38..346fa16c6a 100644 --- a/substrate/executor/src/error.rs +++ b/substrate/executor/src/error.rs @@ -1,18 +1,18 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . //! Rust executor possible errors. diff --git a/substrate/executor/src/lib.rs b/substrate/executor/src/lib.rs index 1bd7a1db25..79b212eb2e 100644 --- a/substrate/executor/src/lib.rs +++ b/substrate/executor/src/lib.rs @@ -1,18 +1,18 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . //! Temporary crate for contracts implementations. //! @@ -27,7 +27,7 @@ #![warn(missing_docs)] -extern crate polkadot_codec as codec; +extern crate substrate_codec as codec; extern crate polkadot_runtime_std as runtime_std; extern crate polkadot_primitives as primitives; extern crate polkadot_serializer as serializer; diff --git a/substrate/executor/src/native_executor.rs b/substrate/executor/src/native_executor.rs index ea13ac6593..d52b0daed1 100644 --- a/substrate/executor/src/native_executor.rs +++ b/substrate/executor/src/native_executor.rs @@ -1,18 +1,18 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . use error::{Error, ErrorKind, Result}; use native_runtime as runtime; diff --git a/substrate/executor/src/wasm_executor.rs b/substrate/executor/src/wasm_executor.rs index 6269675dad..00eb9e67d7 100644 --- a/substrate/executor/src/wasm_executor.rs +++ b/substrate/executor/src/wasm_executor.rs @@ -1,20 +1,20 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . -//! Rust implementation of Polkadot contracts. +//! Rust implementation of Substrate contracts. use std::sync::Arc; use std::cmp::Ordering; diff --git a/substrate/executor/src/wasm_utils.rs b/substrate/executor/src/wasm_utils.rs index f6440628b9..11fc404e2c 100644 --- a/substrate/executor/src/wasm_utils.rs +++ b/substrate/executor/src/wasm_utils.rs @@ -1,20 +1,20 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . -//! Rust implementation of Polkadot contracts. +//! Rust implementation of Substrate contracts. use std::sync::{Arc}; use std::collections::HashMap; diff --git a/substrate/native-runtime/Cargo.toml b/substrate/native-runtime/Cargo.toml index e46823bbb0..b985aa17a9 100644 --- a/substrate/native-runtime/Cargo.toml +++ b/substrate/native-runtime/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Parity Technologies "] [dependencies] -polkadot-codec = { path = "../codec", version = "0.1" } +substrate-codec = { path = "../codec", version = "0.1" } polkadot-runtime-std = { path = "../runtime-std", version = "0.1" } polkadot-primitives = { path = "../primitives", version = "0.1" } rustc-hex = "1.0" @@ -13,4 +13,4 @@ log = { version = "0.3", optional = true } [features] default = ["std"] -std = ["polkadot-codec/std", "polkadot-runtime-std/std", "polkadot-primitives/std", "log"] +std = ["substrate-codec/std", "polkadot-runtime-std/std", "polkadot-primitives/std", "log"] diff --git a/substrate/primitives/Cargo.toml b/substrate/primitives/Cargo.toml index d3ba1eec0f..7fc2544f61 100644 --- a/substrate/primitives/Cargo.toml +++ b/substrate/primitives/Cargo.toml @@ -13,7 +13,7 @@ uint = { git = "https://github.com/rphmeier/primitives.git", branch = "compile-f twox-hash = { version = "1.1.0", optional = true } byteorder = { version = "1.1", default_features = false } blake2-rfc = { version = "0.2.18", optional = true } -polkadot-codec = { path = "../codec", version = "0.1", default_features = false } +substrate-codec = { path = "../codec", version = "0.1", default_features = false } [dev-dependencies] polkadot-serializer = { path = "../serializer", version = "0.1" } @@ -24,7 +24,7 @@ default = ["std"] std = [ "uint/std", "fixed-hash/std", - "polkadot-codec/std", + "substrate-codec/std", "serde/std", "rustc-hex/std", "twox-hash", diff --git a/substrate/primitives/src/lib.rs b/substrate/primitives/src/lib.rs index 59728fb43c..ee95d7ca9a 100644 --- a/substrate/primitives/src/lib.rs +++ b/substrate/primitives/src/lib.rs @@ -43,7 +43,7 @@ extern crate uint as uint_crate; #[cfg(feature = "std")] extern crate core; -extern crate polkadot_codec as codec; +extern crate substrate_codec as codec; #[cfg(test)] extern crate polkadot_serializer; #[cfg(test)] diff --git a/substrate/rpc/Cargo.toml b/substrate/rpc/Cargo.toml index 8095f88fff..a2afb0c118 100644 --- a/substrate/rpc/Cargo.toml +++ b/substrate/rpc/Cargo.toml @@ -7,10 +7,10 @@ authors = ["Parity Technologies "] error-chain = "0.11" 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-client = { path = "../client" } +polkadot-primitives = { path = "../primitives" } +polkadot-state-machine = { path = "../state-machine" } [dev-dependencies] assert_matches = "1.1" -polkadot-executor = { path = "../executor", version = "0.1" } +substrate-executor = { path = "../executor" } diff --git a/substrate/rpc/src/chain/tests.rs b/substrate/rpc/src/chain/tests.rs index 952b20b35c..ad629fd41f 100644 --- a/substrate/rpc/src/chain/tests.rs +++ b/substrate/rpc/src/chain/tests.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Polkadot. If not, see . -use polkadot_executor as executor; +use substrate_executor as executor; use client; use super::*; diff --git a/substrate/rpc/src/lib.rs b/substrate/rpc/src/lib.rs index b18f503547..2feef148c5 100644 --- a/substrate/rpc/src/lib.rs +++ b/substrate/rpc/src/lib.rs @@ -29,7 +29,7 @@ extern crate error_chain; extern crate jsonrpc_macros; #[cfg(test)] -extern crate polkadot_executor; +extern crate substrate_executor; #[cfg(test)] #[macro_use] extern crate assert_matches; diff --git a/substrate/rpc/src/state/tests.rs b/substrate/rpc/src/state/tests.rs index 556fa8cfce..2360ce9e45 100644 --- a/substrate/rpc/src/state/tests.rs +++ b/substrate/rpc/src/state/tests.rs @@ -15,7 +15,7 @@ // along with Polkadot. If not, see . use super::*; -use polkadot_executor as executor; +use substrate_executor as executor; use self::error::{Error, ErrorKind}; use client; diff --git a/substrate/runtime-std/Cargo.toml b/substrate/runtime-std/Cargo.toml index 1822161c39..b88baee4f1 100644 --- a/substrate/runtime-std/Cargo.toml +++ b/substrate/runtime-std/Cargo.toml @@ -13,7 +13,7 @@ pwasm-libc = { path = "../wasm-runtime/pwasm-libc", version = "0.1" } environmental = { path = "../environmental", version = "0.1", optional = true } polkadot-state-machine = { path = "../state-machine", version = "0.1", optional = true } polkadot-primitives = { path = "../primitives", version = "0.1", default_features = false } -polkadot-codec = { path = "../codec", version = "0.1", default_features = false } +substrate-codec = { path = "../codec", version = "0.1", default_features = false } triehash = { version = "0.1", optional = true } ed25519 = { path = "../ed25519", version = "0.1", optional = true } @@ -24,7 +24,7 @@ std = [ "polkadot-state-machine", "triehash", "polkadot-primitives/std", - "polkadot-codec/std", + "substrate-codec/std", "ed25519", ] nightly = [] diff --git a/substrate/runtime-std/src/lib.rs b/substrate/runtime-std/src/lib.rs index 9fb2148b76..0c080a743b 100644 --- a/substrate/runtime-std/src/lib.rs +++ b/substrate/runtime-std/src/lib.rs @@ -24,7 +24,7 @@ #![cfg_attr(feature = "std", doc = "Polkadot runtime standard library as compiled when linked with Rust's standard library.")] #![cfg_attr(not(feature = "std"), doc = "Polkadot's runtime standard library as compiled without Rust's standard library.")] -extern crate polkadot_codec as codec; +extern crate substrate_codec as codec; #[cfg(feature = "std")] include!("../with_std.rs"); diff --git a/substrate/wasm-runtime/Cargo.lock b/substrate/wasm-runtime/Cargo.lock index 97c9736c3f..f807d33069 100644 --- a/substrate/wasm-runtime/Cargo.lock +++ b/substrate/wasm-runtime/Cargo.lock @@ -375,10 +375,6 @@ dependencies = [ "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "polkadot-codec" -version = "0.1.0" - [[package]] name = "polkadot-primitives" version = "0.1.0" @@ -387,10 +383,10 @@ dependencies = [ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "fixed-hash 0.1.3 (git+https://github.com/rphmeier/primitives.git?branch=compile-for-wasm)", - "polkadot-codec 0.1.0", "rustc-hex 2.0.0 (git+https://github.com/rphmeier/rustc-hex.git)", "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-codec 0.1.0", "twox-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "uint 0.1.2 (git+https://github.com/rphmeier/primitives.git?branch=compile-for-wasm)", ] @@ -401,12 +397,12 @@ version = "0.1.0" dependencies = [ "ed25519 0.1.0", "environmental 0.1.0", - "polkadot-codec 0.1.0", "polkadot-primitives 0.1.0", "polkadot-state-machine 0.1.0", "pwasm-alloc 0.1.0", "pwasm-libc 0.1.0", "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-codec 0.1.0", "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -551,9 +547,9 @@ dependencies = [ name = "runtime-polkadot" version = "0.1.0" dependencies = [ - "polkadot-codec 0.1.0", "polkadot-primitives 0.1.0", "polkadot-runtime-std 0.1.0", + "substrate-codec 0.1.0", ] [[package]] @@ -633,6 +629,10 @@ name = "stable_deref_trait" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "substrate-codec" +version = "0.1.0" + [[package]] name = "syn" version = "0.11.11" diff --git a/substrate/wasm-runtime/polkadot/Cargo.toml b/substrate/wasm-runtime/polkadot/Cargo.toml index fcf280ca8c..45b8c711e6 100644 --- a/substrate/wasm-runtime/polkadot/Cargo.toml +++ b/substrate/wasm-runtime/polkadot/Cargo.toml @@ -7,10 +7,10 @@ authors = ["Parity Technologies "] crate-type = ["cdylib"] [dependencies] -polkadot-codec = { path = "../../codec", version = "0.1", default-features = false } +substrate-codec = { path = "../../codec", version = "0.1", default-features = false } polkadot-runtime-std = { path = "../../runtime-std", version = "0.1", default-features = false } polkadot-primitives = { path = "../../primitives", version = "0.1", default-features = false } [features] default = [] -std = ["polkadot-codec/std", "polkadot-runtime-std/std", "polkadot-primitives/std"] +std = ["substrate-codec/std", "polkadot-runtime-std/std", "polkadot-primitives/std"] diff --git a/substrate/wasm-runtime/polkadot/src/lib.rs b/substrate/wasm-runtime/polkadot/src/lib.rs index 36e03e4e68..098fdd09a7 100644 --- a/substrate/wasm-runtime/polkadot/src/lib.rs +++ b/substrate/wasm-runtime/polkadot/src/lib.rs @@ -27,7 +27,7 @@ extern crate rustc_hex; #[macro_use] extern crate log; -extern crate polkadot_codec as codec; +extern crate substrate_codec as codec; extern crate polkadot_primitives as primitives; #[cfg(test)] diff --git a/substrate/wasm-runtime/polkadot/src/runtime/parachains.rs b/substrate/wasm-runtime/polkadot/src/runtime/parachains.rs index 00da191e57..96e395cfa3 100644 --- a/substrate/wasm-runtime/polkadot/src/runtime/parachains.rs +++ b/substrate/wasm-runtime/polkadot/src/runtime/parachains.rs @@ -16,6 +16,7 @@ //! Main parachains logic. For now this is just the determination of which validators do what. +use runtime_std::prelude::*; use runtime_std::mem; use codec::{Slicable, Joiner}; use support::{Hashable, with_env, storage}; diff --git a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm index 669fb901a1..4baec7f8bc 100644 Binary files a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm and b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm differ diff --git a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm index d223adfad3..97e6194261 100644 Binary files a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm and b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm differ diff --git a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm index 045d4dadfa..d317445bea 100644 Binary files a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm and b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm differ diff --git a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.wasm b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.wasm index bbba7527d4..0c77df8679 100644 Binary files a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.wasm and b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.wasm differ