move test-parachains to own folder to work around compilation errors

paritytech · arkpar · Mar 15, 2020 · Mar 15, 2020 · Mar 16, 2020 · Mar 16, 2020
commit e638aa562700e0754cc541c84e757c5e76c06833
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,14 +41,15 @@ members = [
 	"service",
 	"validation",
 
-	"test-parachains/adder",
-	"test-parachains/adder/collator",
-	"test-parachains/code-upgrader",
+	"parachain/test-parachains",
+	"parachain/test-parachains/adder",
+	"parachain/test-parachains/adder/collator",
+	"parachain/test-parachains/code-upgrader",
 ]
 exclude = [
 	"runtime/polkadot/wasm",
 	"runtime/kusama/wasm",
-	"test-parachains/adder/wasm",
+	"parachain/test-parachains/adder/wasm",
 ]
 
 [badges]

diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml
@@ -28,12 +28,6 @@ log = { version = "0.4.8", optional = true }
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 shared_memory = { version = "0.10.0", optional = true }
 
-[dev-dependencies]
-tiny-keccak = "1.5.0"
-adder = { path = "../test-parachains/adder" }
-halt = { path = "../test-parachains/halt" }
-code-upgrader = { path = "../test-parachains/code-upgrader" }
-
 [features]
 default = ["std"]
 wasm-api = ["sp-runtime-interface"]

diff --git a/test-parachains/.gitignore → parachain/test-parachains/.gitignore b/test-parachains/.gitignore → parachain/test-parachains/.gitignore
diff --git a/parachain/test-parachains/Cargo.toml b/parachain/test-parachains/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "test-parachains"
+version = "0.7.22"
+authors = ["Parity Technologies <admin@parity.io>"]
+description = "Integration tests using the test-parachains"
+edition = "2018"
+
+[dependencies]
+tiny-keccak = "1.5.0"
+codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
+
+parachain = { package = "polkadot-parachain", path = ".." }
+adder = { package = "test-parachain-adder", path = "adder" }
+halt = { package = "test-parachain-halt", path = "halt" }
+code-upgrader = { package = "test-parachain-code-upgrader", path = "code-upgrader" }
+
+[features]
+default = [ "std" ]
+std = [
+	"adder/std",
+	"halt/std",
+	"code-upgrader/std",
+]
diff --git a/test-parachains/README.md → parachain/test-parachains/README.md b/test-parachains/README.md → parachain/test-parachains/README.md
diff --git a/test-parachains/adder/Cargo.toml → parachain/test-parachains/adder/Cargo.toml b/test-parachains/adder/Cargo.toml → parachain/test-parachains/adder/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
-name = "adder"
+name = "test-parachain-adder"
 version = "0.7.28-pre1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Test parachain which adds to a number as its state transition"
 edition = "2018"
 build = "build.rs"
 
 [dependencies]
-parachain = { package = "polkadot-parachain", path = "../../parachain/", default-features = false, features = [ "wasm-api" ] }
+parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] }
 codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
 tiny-keccak = "1.5.0"
 dlmalloc = { version = "0.1.3", features = [ "global" ] }

diff --git a/test-parachains/adder/build.rs → parachain/test-parachains/adder/build.rs b/test-parachains/adder/build.rs → parachain/test-parachains/adder/build.rs
diff --git a/test-parachains/adder/collator/Cargo.toml → ...test-parachains/adder/collator/Cargo.toml b/test-parachains/adder/collator/Cargo.toml → ...test-parachains/adder/collator/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
-name = "adder-collator"
+name = "test-parachain-adder-collator"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-adder = { path = ".." }
-parachain = { package = "polkadot-parachain", path = "../../../parachain" }
-collator = { package = "polkadot-collator", path = "../../../collator" }
-primitives = { package = "polkadot-primitives", path = "../../../primitives" }
+adder = { package = "test-parachain-adder", path = ".." }
+parachain = { package = "polkadot-parachain", path = "../../.." }
+collator = { package = "polkadot-collator", path = "../../../../collator" }
+primitives = { package = "polkadot-primitives", path = "../../../../primitives" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 client = { package = "sc-client", git = "https://github.com/paritytech/substrate", branch = "master" }
 client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" }

diff --git a/test-parachains/adder/collator/src/main.rs → ...est-parachains/adder/collator/src/main.rs b/test-parachains/adder/collator/src/main.rs → ...est-parachains/adder/collator/src/main.rs
diff --git a/test-parachains/adder/src/lib.rs → parachain/test-parachains/adder/src/lib.rs b/test-parachains/adder/src/lib.rs → parachain/test-parachains/adder/src/lib.rs
diff --git a/test-parachains/adder/src/wasm_validation.rs → ...t-parachains/adder/src/wasm_validation.rs b/test-parachains/adder/src/wasm_validation.rs → ...t-parachains/adder/src/wasm_validation.rs
diff --git a/test-parachains/adder/wasm/Cargo.toml → ...ain/test-parachains/adder/wasm/Cargo.toml b/test-parachains/adder/wasm/Cargo.toml → ...ain/test-parachains/adder/wasm/Cargo.toml
diff --git a/test-parachains/code-upgrader/Cargo.toml → .../test-parachains/code-upgrader/Cargo.toml b/test-parachains/code-upgrader/Cargo.toml → .../test-parachains/code-upgrader/Cargo.toml
@@ -1,23 +1,23 @@
 [package]
-name = "code-upgrader"
+name = "test-parachain-code-upgrader"
 version = "0.7.22"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Test parachain which can upgrade code"
 edition = "2018"
 build = "build.rs"
 
 [dependencies]
-parachain = { package = "polkadot-parachain", path = "../../parachain/", default-features = false, features = [ "wasm-api" ] }
+parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] }
 codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
 tiny-keccak = "1.5.0"
 dlmalloc = { version = "0.1.3", features = [ "global" ] }
 
 # We need to make sure the global allocator is disabled until we have support of full substrate externalities
-runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false, features = [ "disable_allocator" ] }
+runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] }
 
 [build-dependencies]
 wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" }
 
 [features]
 default = [ "std" ]
-std = []
+std = ["parachain/std"]
diff --git a/test-parachains/halt/build.rs → ...in/test-parachains/code-upgrader/build.rs b/test-parachains/halt/build.rs → ...in/test-parachains/code-upgrader/build.rs
diff --git a/test-parachains/code-upgrader/src/lib.rs → .../test-parachains/code-upgrader/src/lib.rs b/test-parachains/code-upgrader/src/lib.rs → .../test-parachains/code-upgrader/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Basic parachain that adds a number as part of its state.
+//! Test parachain WASM which implements code ugprades.
 
 #![no_std]
 

diff --git a/...ains/code-upgrader/src/wasm_validation.rs → ...ains/code-upgrader/src/wasm_validation.rs b/...ains/code-upgrader/src/wasm_validation.rs → ...ains/code-upgrader/src/wasm_validation.rs
diff --git a/...-parachains/code-upgrader/wasm/Cargo.toml → ...-parachains/code-upgrader/wasm/Cargo.toml b/...-parachains/code-upgrader/wasm/Cargo.toml → ...-parachains/code-upgrader/wasm/Cargo.toml
diff --git a/test-parachains/halt/Cargo.toml → parachain/test-parachains/halt/Cargo.toml b/test-parachains/halt/Cargo.toml → parachain/test-parachains/halt/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "halt"
+name = "test-parachain-halt"
 version = "0.7.28-pre1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Test parachain which executes forever"

diff --git a/test-parachains/code-upgrader/build.rs → parachain/test-parachains/halt/build.rs b/test-parachains/code-upgrader/build.rs → parachain/test-parachains/halt/build.rs
@@ -19,7 +19,7 @@ use wasm_builder_runner::WasmBuilder;
 fn main() {
 	WasmBuilder::new()
 		.with_current_project()
-		.with_wasm_builder_from_crates("1.0.9")
+		.with_wasm_builder_from_git("https://github.com/paritytech/substrate.git", "8c672e107789ed10973d937ba8cac245404377e2")
 		.export_heap_base()
 		.build()
 }
diff --git a/test-parachains/halt/src/lib.rs → parachain/test-parachains/halt/src/lib.rs b/test-parachains/halt/src/lib.rs → parachain/test-parachains/halt/src/lib.rs
diff --git a/parachain/test-parachains/src/lib.rs b/parachain/test-parachains/src/lib.rs
@@ -0,0 +1,17 @@
+// Copyright 2020 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot 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,
+// 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 <http://www.gnu.org/licenses/>.
+
+//! Stub - the fundamental logic of this crate is the integration tests.
diff --git a/parachain/tests/adder/mod.rs → parachain/test-parachains/tests/adder/mod.rs b/parachain/tests/adder/mod.rs → parachain/test-parachains/tests/adder/mod.rs
@@ -16,10 +16,9 @@
 
 //! Basic parachain that adds a number as part of its state.
 
-use polkadot_parachain as parachain;
-
 use crate::{
 	DummyExt,
+	parachain,
 	parachain::primitives::{
 		RelayChainBlockNumber,
 		BlockData as GenericBlockData,

diff --git a/parachain/tests/code_upgrader/mod.rs → ...est-parachains/tests/code_upgrader/mod.rs b/parachain/tests/code_upgrader/mod.rs → ...est-parachains/tests/code_upgrader/mod.rs
@@ -16,7 +16,7 @@
 
 //! Basic parachain that adds a number as part of its state.
 
-use polkadot_parachain as parachain;
+use parachain;
 
 use crate::{
 	DummyExt,

diff --git a/parachain/tests/lib.rs → parachain/test-parachains/tests/lib.rs b/parachain/tests/lib.rs → parachain/test-parachains/tests/lib.rs
@@ -18,9 +18,8 @@ mod adder;
 mod code_upgrader;
 mod wasm_executor;
 
-use polkadot_parachain as parachain;
-use crate::parachain::{
-	primitives::UpwardMessage, wasm_executor::{Externalities, run_worker},
+use parachain::{
+	self, primitives::UpwardMessage, wasm_executor::{Externalities, run_worker},
 };
 
 struct DummyExt;

diff --git a/parachain/tests/wasm_executor/mod.rs → ...est-parachains/tests/wasm_executor/mod.rs b/parachain/tests/wasm_executor/mod.rs → ...est-parachains/tests/wasm_executor/mod.rs
@@ -16,7 +16,7 @@
 
 //! Basic parachain that adds a number as part of its state.
 
-use polkadot_parachain as parachain;
+use parachain;
 use crate::{adder, DummyExt};
 use crate::parachain::{
 	primitives::{BlockData, ValidationParams},