From e8be7af38386e54f78ad6cabd856810cf8136d33 Mon Sep 17 00:00:00 2001
From: Valery Gantchev <v@lery.nl>
Date: Wed, 4 Sep 2024 21:54:18 +0200
Subject: [PATCH] merge conflicts

---
 launch-configs/zombienet/local.json | 15 +++++++++++++++
 runtime/basilisk/src/lib.rs         |  3 ---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/launch-configs/zombienet/local.json b/launch-configs/zombienet/local.json
index 3df2b8cb2a..5be03ae0c9 100644
--- a/launch-configs/zombienet/local.json
+++ b/launch-configs/zombienet/local.json
@@ -10,6 +10,21 @@
       "--no-hardware-benchmarks",
       "--database=paritydb"
     ],
+    "genesis": {
+      "runtimeGenesis": {
+        "patch": {
+          "configuration": {
+            "config": {
+              "scheduling_lookahead": 2,
+              "async_backing_params": {
+                "max_candidate_depth": 3,
+                "allowed_ancestry_len": 2
+              }
+            }
+          }
+        }
+      }
+    },
     "nodes": [
       {
         "name": "alice",
diff --git a/runtime/basilisk/src/lib.rs b/runtime/basilisk/src/lib.rs
index d0b48723ec..b939d194c0 100644
--- a/runtime/basilisk/src/lib.rs
+++ b/runtime/basilisk/src/lib.rs
@@ -59,9 +59,6 @@ use frame_support::sp_runtime::{
 	ApplyExtrinsicResult,
 };
 use frame_system::pallet_prelude::BlockNumberFor;
-pub use primitives::{
-	AccountId, Amount, AssetId, Balance, BlockNumber, CollectionId, Hash, Index, ItemId, Price, Signature,
-};
 use sp_api::impl_runtime_apis;
 pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 use sp_core::{ConstU32, OpaqueMetadata};