move test parachains around a little

Cargo.toml

@@ -28,6 +28,9 @@ members = [
 	"polkadot/transaction-pool",
 	"polkadot/service",
 
+	"polkadot/test-parachains/basic-add",
+	"polkadot/test-parachains/basic-add/wasm",
+
 	"substrate/bft",
 	"substrate/client",
 	"substrate/client/db",
@@ -79,6 +82,10 @@ exclude = [
 	"substrate/test-runtime/wasm",
 ]
 
+[profile.release]
+panic = "abort"
+lto = true
+
 [badges]
 travis-ci = { repository = "paritytech/polkadot", branch = "master" }
 maintenance = { status = "actively-developed" }

polkadot/test-parachains/basic-add/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "basic-add"
+version = "0.1.0"
+authors = ["Parity Technologies <[email protected]>"]
+description = "Test parachain which adds to a number as its state transition"
+
+[dependencies]
+polkadot-parachain = { path = "../../parachain/", default-features = false }
+tiny-keccak = "1.4"

polkadot/parachain/test-chains/basic_add/src/collator.rs → polkadot/test-parachains/basic-add/src/collator.rs

@@ -20,8 +20,12 @@ extern crate polkadot_parachain as parachain;
 extern crate polkadot_collator as collator;
 extern crate tiny_keccak;
 
+use collator::ParachainContext;
+
 mod common;
 
 fn main() {
-	println!("Hello!");
+	::collator::run_collator(
+
+	)
 }

polkadot/parachain/test-chains/basic_add/src/common.rs → polkadot/test-parachains/basic-add/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2018 Parity Technologies (UK) Ltd.
+// Copyright 2017 Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -14,7 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Data definitions for the basic_add parachain.
+//! Basic parachain that adds a number as part of its state.
+
+#![no_std]
+
+extern crate polkadot_parachain as parachain;
+extern crate tiny_keccak;
 
 use parachain::codec::{Decode, Encode, Input, Output};
 

polkadot/test-parachains/basic-add/wasm/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "basic-add-wasm"
+version = "0.1.0"
+authors = ["Parity Technologies <[email protected]>"]
+
+[dependencies]
+basic-add = { path = ".." }
+polkadot-parachain = { path = "../../../parachain", default-features = false }
+wee_alloc = { version = "0.4.1" }
+pwasm-libc = { version = "0.2" }
+tiny-keccak = "1.4"
+
+[profile.release]
+panic = "abort"
+lto = true
+
+[lib]
+crate-type = ["cdylib"]

polkadot/parachain/test-chains/basic_add/src/wasm.rs → polkadot/test-parachains/basic-add/wasm/src/lib.rs

@@ -14,12 +14,30 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Defines WASM module logic.
+//! WASM validation for basic-add parachain.
 
-use core::{intrinsics, panic, alloc};
-use parachain::{self, ValidationResult};
+#![no_std]
+
+#![feature(
+	alloc, core_intrinsics, lang_items, panic_implementation, core_panic_info,
+	alloc_error_handler
+)]
+
+extern crate alloc;
+extern crate wee_alloc;
+extern crate pwasm_libc;
+extern crate basic_add;
+extern crate polkadot_parachain as parachain;
+extern crate tiny_keccak;
+
+// Define global allocator.
+#[global_allocator]
+static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
+
+use core::{intrinsics, panic};
+use parachain::ValidationResult;
 use parachain::codec::{Encode, Decode};
-use super::{HeadData, BlockData};
+use basic_add::{HeadData, BlockData};
 
 #[panic_implementation]
 #[no_mangle]
@@ -31,7 +49,7 @@ pub fn panic(_info: &panic::PanicInfo) -> ! {
 
 #[alloc_error_handler]
 #[no_mangle]
-pub fn oom(_: alloc::Layout) -> ! {
+pub fn oom(_: ::core::alloc::Layout) -> ! {
 	unsafe {
 		intrinsics::abort();
 	}
@@ -48,9 +66,8 @@ pub extern fn validate(offset: usize, len: usize) -> usize {
 
 	let parent_hash = ::tiny_keccak::keccak256(&params.parent_head[..]);
 
-	match ::common::execute(parent_hash, parent_head, &block_data) {
+	match ::basic_add::execute(parent_hash, parent_head, &block_data) {
 		Ok(new_head) => parachain::write_result(ValidationResult { head_data: new_head.encode() }),
 		Err(_) => panic!("execution failure"),
 	}
-
 }