[fix] resolve conflicts after rebasing

Signed-off-by: VAmuzing <amuzik95@gmail.com>
hyperledger · Apr 11, 2024 · 7c963d7 · 7c963d7
1 parent 198fa91
commit 7c963d7
Showing 1 changed file with 5 additions and 3 deletions.
diff --git 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>,