Feature/plmc 391 allow parallel instantiaton of projects

Cargo.toml

@@ -5,9 +5,9 @@ members = [
     "pallets/*",
     "integration-tests",
     "integration-tests/penpal",
-    "integration-tests/macros",
-    "integration-tests/macros/tests",
-    "traits",
+    "macros",
+    "macros/tests",
+    "polimec-common",
 ]
 
 resolver = "2"
@@ -61,16 +61,16 @@ polimec-xcm-executor = { path = "pallets/xcm-executor", default-features = false
 polimec-receiver = { path = "pallets/polimec-receiver", default-features = false }
 
 # Internal macros
-macros = { path = "integration-tests/macros" }
-macros-tests = { path = "integration-tests/macros/tests" }
+macros = { path = "macros" }
+macros-tests = { path = "macros/tests" }
 
 
 # External pallets (with default disabled)
 orml-oracle = {git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.0.0", default-features = false}
 orml-traits = {git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.0.0", default-features = false}
 # Internal support (with default disabled)
 shared-configuration = { path = "runtimes/shared-configuration", default-features = false }
-polimec-traits = { path = "traits", default-features = false }
+polimec-common = { path = "polimec-common", default-features = false }
 
 # External support (with default disabled)
 substrate-fixed = { git = "https://github.com/encointer/substrate-fixed", default-features = false }

integration-tests/Cargo.toml

@@ -20,8 +20,7 @@ scale-info = { workspace = true, features = ["derive"] }
 # Local
 polimec-receiver.workspace = true
 macros.workspace = true
-polimec-traits.workspace = true
-
+polimec-common.workspace = true
 sp-arithmetic.workspace = true
 frame-system.workspace = true
 frame-support.workspace = true
@@ -99,7 +98,6 @@ std = [
 	"penpal-runtime/std",
 	"polimec-parachain-runtime/std",
 	"polimec-receiver/std",
-	"polimec-traits/std",
 	"polkadot-core-primitives/std",
 	"polkadot-parachain/std",
 	"polkadot-primitives/std",
@@ -140,7 +138,6 @@ runtime-benchmarks = [
 	"polimec-base-runtime/runtime-benchmarks",
 	"polimec-parachain-runtime/runtime-benchmarks",
 	"polimec-receiver/runtime-benchmarks",
-	"polimec-traits/runtime-benchmarks",
 	"polkadot-parachain/runtime-benchmarks",
 	"polkadot-primitives/runtime-benchmarks",
 	"polkadot-runtime-parachains/runtime-benchmarks",
@@ -177,7 +174,7 @@ try-runtime = [
 	"polimec-base-runtime/try-runtime",
 	"polimec-parachain-runtime/try-runtime",
 	"polimec-receiver/try-runtime",
-	"polimec-traits/try-runtime",
+	"polimec-common/try-runtime",
 	"polkadot-runtime-parachains/try-runtime",
 	"polkadot-runtime/try-runtime",
 	"polkadot-service/try-runtime",

integration-tests/penpal/Cargo.toml

@@ -23,7 +23,7 @@ smallvec = "1.10.0"
 
 # Local
 polimec-receiver.workspace = true
-polimec-traits.workspace = true
+polimec-common.workspace = true
 
 # Substrate
 frame-benchmarking = { workspace = true, optional = true }
@@ -117,7 +117,6 @@ std = [
 	"parachain-info/std",
 	"parachains-common/std",
 	"polimec-receiver/std",
-	"polimec-traits/std",
 	"polkadot-parachain/std",
 	"polkadot-primitives/std",
 	"polkadot-runtime-common/std",
@@ -158,7 +157,6 @@ runtime-benchmarks = [
 	"pallet-vesting/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
 	"polimec-receiver/runtime-benchmarks",
-	"polimec-traits/runtime-benchmarks",
 	"polkadot-parachain/runtime-benchmarks",
 	"polkadot-primitives/runtime-benchmarks",
 	"polkadot-runtime-common/runtime-benchmarks",
@@ -192,7 +190,6 @@ try-runtime = [
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
 	"polimec-receiver/try-runtime",
-	"polimec-traits/try-runtime",
 	"polkadot-runtime-common/try-runtime",
 	"polkadot-runtime-parachains/try-runtime",
 	"sp-runtime/try-runtime",

integration-tests/penpal/src/lib.rs

@@ -48,7 +48,7 @@ use frame_system::{
 	limits::{BlockLength, BlockWeights},
 	EnsureRoot, EnsureSigned,
 };
-use polimec_traits::migration_types::MigrationInfo;
+use polimec_common::migration_types::MigrationInfo;
 use smallvec::smallvec;
 use sp_api::impl_runtime_apis;
 pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;

integration-tests/src/constants.rs

@@ -300,7 +300,6 @@ pub mod polimec {
 					.to_vec(),
 				..Default::default()
 			},
-			polimec_funding: Default::default(),
 			balances: polimec_parachain_runtime::BalancesConfig { balances: funded_accounts },
 			parachain_info: polimec_parachain_runtime::ParachainInfoConfig {
 				parachain_id: PARA_ID.into(),
@@ -359,6 +358,7 @@ pub mod polimec {
 			},
 			technical_committee: Default::default(),
 			treasury: Default::default(),
+			polimec_funding: Default::default(),
 			vesting: Default::default(),
 		};
 

integration-tests/src/lib.rs

@@ -13,10 +13,8 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 pub mod constants;
 
-#[cfg(all(test, feature = "std", feature = "testing-node"))]
 mod tests;
 
 pub use constants::{accounts::*, penpal, polimec, polimec_base, polkadot, statemint};

integration-tests/src/tests/basic_comms.rs

@@ -1,3 +1,4 @@
+#[allow(unused_imports)]
 use crate::*;
 
 const MAX_REF_TIME: u64 = 300_000_000;

integration-tests/src/tests/build_spec.rs

@@ -0,0 +1,31 @@
+#[test]
+fn build_spec_testing_node() {
+	// run the polimec-parachain-node compiled with "std" with the build-spec command and --raw flag
+	// This makes sure our async parallel instantiation of projects is working as intended.
+	// We need this to test the protocol with the UI.
+
+	match std::env::current_dir() {
+		Ok(path) => {
+			println!("The current directory is {}", path.display());
+		},
+		Err(e) => {
+			println!("Error getting the current directory: {}", e);
+		},
+	}
+
+	let output = std::process::Command::new("../target/release/polimec-parachain-node")
+		.arg("build-spec")
+		.arg("--chain=polimec-testing")
+		.arg("--disable-default-bootnode")
+		.arg("--raw")
+		.output()
+		.expect("failed to execute process");
+
+	assert_eq!(
+		output.status.success(),
+		true,
+		"Make sure you compile the node with \"std\" and \"fast-gov\" feature enabled before running this test."
+	);
+
+	dbg!(output);
+}