fix: testing chain spec extension

.github/workflows/tests.yml

@@ -156,6 +156,9 @@ jobs:
   test-inclusion:
     needs: [build]
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        chain: [ main, testing ]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -184,7 +187,7 @@ jobs:
         with:
           node-version: '14'
           check-latest: true
-      - run: npm install && npm start
+      - run: npm install && npm run ${{ matrix.chain }}
         name: Launch rococo local & wait for inclusion
         working-directory: scripts/wait-for-inclusion
 

node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "basilisk"
-version = "5.1.0"
+version = "5.1.1"
 description = "Basilisk node"
 authors = ["GalacticCouncil"]
 edition = "2018"

node/src/chain_spec.rs

@@ -58,7 +58,6 @@ pub struct Extensions {
 
 impl Extensions {
 	/// Try to get the extension from the given `ChainSpec`.
-	#[allow(clippy::borrowed_box)]
 	pub fn try_get(chain_spec: &dyn sc_service::ChainSpec) -> Option<&Self> {
 		sc_chain_spec::get_extension(chain_spec.extensions())
 	}

node/src/testing_chain_spec.rs

@@ -21,9 +21,7 @@
 use cumulus_primitives_core::ParaId;
 use hex_literal::hex;
 use primitives::{AssetId, BlockNumber, Price};
-use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup};
 use sc_service::ChainType;
-use serde::{Deserialize, Serialize};
 use serde_json::map::Map;
 use sp_core::{crypto::UncheckedInto, sr25519, Pair, Public};
 use sp_runtime::traits::{IdentifyAccount, Verify};
@@ -33,32 +31,14 @@ use testing_basilisk_runtime::{
 	ParachainInfoConfig, SessionConfig, Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TokensConfig,
 	VestingConfig, NATIVE_EXISTENTIAL_DEPOSIT, UNITS, WASM_BINARY,
 };
+use crate::chain_spec::Extensions;
 
 const TOKEN_DECIMALS: u8 = 12;
 const TOKEN_SYMBOL: &str = "BSX";
 const PROTOCOL_ID: &str = "bsx";
 //Kusama parachain id
 const PARA_ID: u32 = 2090;
 
-/// The extensions for the [`ChainSpec`].
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, ChainSpecGroup, ChainSpecExtension)]
-#[serde(deny_unknown_fields)]
-pub struct Extensions {
-	/// The relay chain of the Parachain.
-	pub relay_chain: String,
-	/// The id of the Parachain.
-	pub para_id: u32,
-}
-
-impl Extensions {
-	/// Try to get the extension from the given `ChainSpec`.
-	#[allow(clippy::borrowed_box)]
-	#[allow(dead_code)]
-	pub fn try_get(chain_spec: &Box<dyn sc_service::ChainSpec>) -> Option<&Self> {
-		sc_chain_spec::get_extension(chain_spec.extensions())
-	}
-}
-
 /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
 pub type ChainSpec = sc_service::GenericChainSpec<GenesisConfig, Extensions>;
 

rococo-local/testing-config.json

@@ -24,11 +24,15 @@
         "port": 30777
       }
     ],
-    "runtime_genesis_config": {
-      "parachainsConfiguration": {
-        "config": {
-          "validation_upgrade_frequency": 1,
-          "validation_upgrade_delay": 1
+    "genesis": {
+      "runtime": {
+        "runtime_genesis_config": {
+          "configuration": {
+            "config": {
+              "validation_upgrade_frequency": 1,
+              "validation_upgrade_delay": 10
+            }
+          }
         }
       }
     }
@@ -37,7 +41,7 @@
   "parachains": [
     {
       "bin": "../target/release/testing-basilisk",
-      "chain":"dev",
+      "chain":"local",
       "balance": "1000000000000000000000",
       "nodes": [
         {