From 7ecad1d7a40d1b1851554286d69b1f3a44908968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20HUBERT=20/=20PALO-IT?= Date: Fri, 30 Sep 2022 09:52:29 +0200 Subject: [PATCH] fix EtE CLI parameters --- .../mithril-end-to-end/src/mithril/aggregator.rs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs b/mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs index 23c36084edb..8cc44b6b4c7 100644 --- a/mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs +++ b/mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs @@ -21,13 +21,13 @@ impl Aggregator { work_dir: &Path, bin_dir: &Path, ) -> Result { - let port = server_port.to_string(); let magic_id = DEVNET_MAGIC_ID.to_string(); let env = HashMap::from([ ("NETWORK", "devnet"), ("PROTOCOL_PARAMETERS__K", "5"), ("PROTOCOL_PARAMETERS__M", "100"), ("PROTOCOL_PARAMETERS__PHI_F", "0.65"), + ("SERVER_IP", "0.0.0.0"), ("RUN_INTERVAL", "600"), ("URL_SNAPSHOT_MANIFEST", ""), ("SNAPSHOT_STORE_TYPE", "local"), @@ -42,13 +42,7 @@ impl Aggregator { ("GENESIS_VERIFICATION_KEY", "5b33322c3235332c3138362c3230312c3137372c31312c3131372c3133352c3138372c3136372c3138312c3138382c32322c35392c3230362c3130352c3233312c3135302c3231352c33302c37382c3231322c37362c31362c3235322c3138302c37322c3133342c3133372c3234372c3136312c36385d"), ("GENESIS_SECRET_KEY", "5b3131382c3138342c3232342c3137332c3136302c3234312c36312c3134342c36342c39332c3130362c3232392c38332c3133342c3138392c34302c3138392c3231302c32352c3138342c3136302c3134312c3233372c32362c3136382c35342c3233392c3230342c3133392c3131392c31332c3139395d"), ]); - let args = vec![ - "--db-directory", - bft_node.db_path.to_str().unwrap(), - "--server-port", - &port, - "-vvv", - ]; + let args = vec!["--db-directory", bft_node.db_path.to_str().unwrap(), "-vvv"]; let command = MithrilCommand::new("mithril-aggregator", work_dir, bin_dir, env, &args)?; @@ -69,7 +63,11 @@ impl Aggregator { } pub fn serve(&mut self) -> Result<(), String> { - self.process = Some(self.command.start(&["serve".to_string()])?); + self.process = Some(self.command.start(&[ + "serve".to_string(), + "--server-port".to_string(), + self.server_port.to_string(), + ])?); Ok(()) }