From 7c963d73fbb90ab7fecbc4502cf46569551c4bfa Mon Sep 17 00:00:00 2001
From: VAmuzing <amuzik95@gmail.com>
Date: Fri, 12 Apr 2024 00:10:00 +0300
Subject: [PATCH] [fix] resolve conflicts after rebasing

Signed-off-by: VAmuzing <amuzik95@gmail.com>
---
 config/src/parameters/user.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/src/parameters/user.rs b/config/src/parameters/user.rs
index 079964c4d76..db73165b07a 100644
--- a/config/src/parameters/user.rs
+++ b/config/src/parameters/user.rs
@@ -147,7 +147,7 @@ impl Root {
             None
         }, Some);
 
-        let genesis = self.genesis.parse().map_or_else(
+        let genesis = self.genesis.parse(cli).map_or_else(
             |err| {
                 // FIXME
                 emitter.emit(eyre!("{err}"));
@@ -186,7 +186,7 @@ impl Root {
             }
         }
 
-        let (p2p_address, block_sync, transaction_gossiper) = self.network.parse();
+        let (network, block_sync, transaction_gossiper) = self.network.parse();
 
         let logger = self.logger;
         let queue = self.queue;
@@ -275,7 +275,9 @@ fn validate_directory_path(
 }
 
 #[derive(Copy, Clone)]
-pub struct CliContext {}
+pub struct CliContext {
+    pub submit_genesis: bool,
+}
 
 pub(crate) fn private_key_from_env<E: Error>(
     emitter: &mut Emitter<Report>,