diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock index e6ddb9cf39..919454982a 100644 --- a/substrate/Cargo.lock +++ b/substrate/Cargo.lock @@ -1004,10 +1004,10 @@ dependencies = [ "native-runtime 0.1.0", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "polkadot-serializer 0.1.0", - "polkadot-state-machine 0.1.0", "substrate-codec 0.1.0", "substrate-executor 0.1.0", "substrate-primitives 0.1.0", + "substrate-state-machine 0.1.0", "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1034,7 +1034,6 @@ dependencies = [ "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "polkadot-client 0.1.0", "polkadot-serializer 0.1.0", - "polkadot-state-machine 0.1.0", "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1042,6 +1041,7 @@ dependencies = [ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-primitives 0.1.0", + "substrate-state-machine 0.1.0", ] [[package]] @@ -1053,9 +1053,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-state-machine 0.1.0", "substrate-executor 0.1.0", "substrate-primitives 0.1.0", + "substrate-state-machine 0.1.0", ] [[package]] @@ -1073,12 +1073,12 @@ version = "0.1.0" dependencies = [ "ed25519 0.1.0", "environmental 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", "substrate-primitives 0.1.0", + "substrate-state-machine 0.1.0", "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1090,19 +1090,6 @@ dependencies = [ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "polkadot-state-machine" -version = "0.1.0" -dependencies = [ - "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hashdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hex-literal 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memorydb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "patricia-trie 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-primitives 0.1.0", - "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "polkadot-validator" version = "0.1.0" @@ -1448,12 +1435,12 @@ dependencies = [ "parity-wasm 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)", "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", "substrate-primitives 0.1.0", + "substrate-state-machine 0.1.0", "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1475,6 +1462,19 @@ dependencies = [ "uint 0.1.2 (git+https://github.com/rphmeier/primitives.git?branch=compile-for-wasm)", ] +[[package]] +name = "substrate-state-machine" +version = "0.1.0" +dependencies = [ + "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hashdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hex-literal 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memorydb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "patricia-trie 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-primitives 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/client/Cargo.toml b/substrate/client/Cargo.toml index 313b48cce3..0901b92b73 100644 --- a/substrate/client/Cargo.toml +++ b/substrate/client/Cargo.toml @@ -8,7 +8,7 @@ error-chain = "0.11" log = "0.3" parking_lot = "0.4" substrate-primitives = { path = "../primitives", version = "0.1" } -polkadot-state-machine = { path = "../state-machine", version = "0.1" } +substrate-state-machine = { path = "../state-machine", version = "0.1" } polkadot-serializer = { path = "../serializer" } substrate-executor = { path = "../executor" } substrate-codec = { path = "../codec", version = "0.1" } diff --git a/substrate/client/src/lib.rs b/substrate/client/src/lib.rs index 02bc273cac..d38cda6945 100644 --- a/substrate/client/src/lib.rs +++ b/substrate/client/src/lib.rs @@ -19,7 +19,7 @@ #![warn(missing_docs)] extern crate substrate_primitives as primitives; -extern crate polkadot_state_machine as state_machine; +extern crate substrate_state_machine as state_machine; extern crate polkadot_serializer as ser; extern crate substrate_codec as codec; extern crate substrate_executor; diff --git a/substrate/executor/Cargo.toml b/substrate/executor/Cargo.toml index c098d3d117..081ade6b0f 100644 --- a/substrate/executor/Cargo.toml +++ b/substrate/executor/Cargo.toml @@ -9,7 +9,7 @@ substrate-codec = { path = "../codec", version = "0.1" } polkadot-runtime-std = { path = "../runtime-std", version = "0.1" } substrate-primitives = { path = "../primitives", version = "0.1" } polkadot-serializer = { path = "../serializer", version = "0.1" } -polkadot-state-machine = { path = "../state-machine" , version = "0.1" } +substrate-state-machine = { path = "../state-machine" , version = "0.1" } native-runtime = { path = "../native-runtime", version = "0.1" } ed25519 = { path = "../ed25519", version = "0.1" } serde = "1.0" diff --git a/substrate/executor/src/lib.rs b/substrate/executor/src/lib.rs index cb754a93f5..9d5a012c34 100644 --- a/substrate/executor/src/lib.rs +++ b/substrate/executor/src/lib.rs @@ -31,7 +31,7 @@ extern crate substrate_codec as codec; extern crate polkadot_runtime_std as runtime_std; extern crate substrate_primitives as primitives; extern crate polkadot_serializer as serializer; -extern crate polkadot_state_machine as state_machine; +extern crate substrate_state_machine as state_machine; extern crate ed25519; extern crate serde; diff --git a/substrate/network/Cargo.toml b/substrate/network/Cargo.toml index 4a49ae5283..e2e901a0df 100644 --- a/substrate/network/Cargo.toml +++ b/substrate/network/Cargo.toml @@ -12,7 +12,7 @@ ethcore-network = { git = "https://github.com/paritytech/parity.git" } ethcore-io = { git = "https://github.com/paritytech/parity.git" } substrate-primitives = { path = "../primitives" } polkadot-client = { path = "../client" } -polkadot-state-machine = { path = "../state-machine" } +substrate-state-machine = { path = "../state-machine" } polkadot-serializer = { path = "../serializer" } log = "0.3" env_logger = "0.4" diff --git a/substrate/network/src/lib.rs b/substrate/network/src/lib.rs index 0116363dca..059ba93221 100644 --- a/substrate/network/src/lib.rs +++ b/substrate/network/src/lib.rs @@ -29,7 +29,7 @@ extern crate smallvec; extern crate ipnetwork; extern crate substrate_primitives as primitives; extern crate polkadot_client as client; -extern crate polkadot_state_machine as state_machine; +extern crate substrate_state_machine as state_machine; extern crate polkadot_serializer as ser; extern crate serde; extern crate serde_json; diff --git a/substrate/rpc/Cargo.toml b/substrate/rpc/Cargo.toml index a19dc5353c..fdf9f7595b 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" } substrate-primitives = { path = "../primitives" } -polkadot-state-machine = { path = "../state-machine" } +substrate-state-machine = { path = "../state-machine" } [dev-dependencies] assert_matches = "1.1" diff --git a/substrate/rpc/src/lib.rs b/substrate/rpc/src/lib.rs index 701eed9ff9..68935fb00b 100644 --- a/substrate/rpc/src/lib.rs +++ b/substrate/rpc/src/lib.rs @@ -21,7 +21,7 @@ extern crate jsonrpc_core as rpc; extern crate polkadot_client as client; extern crate substrate_primitives as primitives; -extern crate polkadot_state_machine as state_machine; +extern crate substrate_state_machine as state_machine; #[macro_use] extern crate error_chain; diff --git a/substrate/runtime-std/Cargo.toml b/substrate/runtime-std/Cargo.toml index badf3355fb..4429017974 100644 --- a/substrate/runtime-std/Cargo.toml +++ b/substrate/runtime-std/Cargo.toml @@ -11,7 +11,7 @@ rustc_version = "0.2" pwasm-alloc = { path = "../wasm-runtime/pwasm-alloc", version = "0.1" } 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 } +substrate-state-machine = { path = "../state-machine", version = "0.1", optional = true } substrate-primitives = { path = "../primitives", version = "0.1", default_features = false } substrate-codec = { path = "../codec", version = "0.1", default_features = false } triehash = { version = "0.1", optional = true } @@ -21,7 +21,7 @@ ed25519 = { path = "../ed25519", version = "0.1", optional = true } default = ["std"] std = [ "environmental", - "polkadot-state-machine", + "substrate-state-machine", "triehash", "substrate-primitives/std", "substrate-codec/std", diff --git a/substrate/runtime-std/with_std.rs b/substrate/runtime-std/with_std.rs index 9c4cb5e1bd..88bfbd940c 100644 --- a/substrate/runtime-std/with_std.rs +++ b/substrate/runtime-std/with_std.rs @@ -17,7 +17,7 @@ #[macro_use] extern crate environmental; -extern crate polkadot_state_machine; +extern crate substrate_state_machine; extern crate substrate_primitives as primitives; extern crate triehash; extern crate ed25519; @@ -32,7 +32,7 @@ pub use std::mem; // re-export hashing functions. pub use primitives::{blake2_256, twox_128, twox_256}; -pub use polkadot_state_machine::{Externalities, ExternalitiesError, TestExternalities}; +pub use substrate_state_machine::{Externalities, ExternalitiesError, TestExternalities}; use primitives::hexdisplay::HexDisplay; // TODO: use the real error, not NoError. diff --git a/substrate/state-machine/Cargo.toml b/substrate/state-machine/Cargo.toml index d326d1f6a9..646c6d7f1d 100644 --- a/substrate/state-machine/Cargo.toml +++ b/substrate/state-machine/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "polkadot-state-machine" +name = "substrate-state-machine" version = "0.1.0" authors = ["Parity Technologies "] -description = "Polkadot State Machine" +description = "Substrate State Machine" [dependencies] substrate-primitives = { path = "../primitives", version = "0.1.0" } diff --git a/substrate/state-machine/src/backend.rs b/substrate/state-machine/src/backend.rs index 2ad10e44d3..a1dec6dc3a 100644 --- a/substrate/state-machine/src/backend.rs +++ b/substrate/state-machine/src/backend.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 . //! State machine backends. These manage the code and storage of contracts. diff --git a/substrate/state-machine/src/ext.rs b/substrate/state-machine/src/ext.rs index 1beca17fa6..e0176ad41c 100644 --- a/substrate/state-machine/src/ext.rs +++ b/substrate/state-machine/src/ext.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 . //! Conrete externalities implementation. diff --git a/substrate/state-machine/src/lib.rs b/substrate/state-machine/src/lib.rs index 6998153f82..8a7af31a05 100644 --- a/substrate/state-machine/src/lib.rs +++ b/substrate/state-machine/src/lib.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 . -//! Polkadot state machine implementation. +//! Substrate state machine implementation. #![warn(missing_docs)] diff --git a/substrate/state-machine/src/testing.rs b/substrate/state-machine/src/testing.rs index 1c9c4dfcf8..a85e1d3f4a 100644 --- a/substrate/state-machine/src/testing.rs +++ b/substrate/state-machine/src/testing.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 . //! Test implementation for Externalities. diff --git a/substrate/wasm-runtime/Cargo.lock b/substrate/wasm-runtime/Cargo.lock index a91e7a7233..a5ce44c433 100644 --- a/substrate/wasm-runtime/Cargo.lock +++ b/substrate/wasm-runtime/Cargo.lock @@ -381,7 +381,7 @@ version = "0.1.0" dependencies = [ "ed25519 0.1.0", "environmental 0.1.0", - "polkadot-state-machine 0.1.0", + "substrate-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)", @@ -391,7 +391,7 @@ dependencies = [ ] [[package]] -name = "polkadot-state-machine" +name = "substrate-state-machine" version = "0.1.0" dependencies = [ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",