Make protocol parameters configuration explicit

In the end to end test.

Author: jpraynaud

mithril-test-lab/mithril-end-to-end/src/end_to_end_spec.rs

@@ -2,7 +2,7 @@ use crate::utils::AttemptResult;
 use crate::{attempt, Aggregator, Client, ClientCommand, Devnet, MithrilInfrastructure};
 use mithril_common::chain_observer::{CardanoCliChainObserver, ChainObserver};
 use mithril_common::digesters::ImmutableFile;
-use mithril_common::entities::{Certificate, Epoch, EpochSettings, Snapshot};
+use mithril_common::entities::{Certificate, Epoch, EpochSettings, ProtocolParameters, Snapshot};
 use reqwest::StatusCode;
 use slog_scope::{info, warn};
 use std::error::Error;
@@ -60,7 +60,7 @@ impl Spec {
         )
         .await?;
 
-        // Wait 5 epochs after updating protocol parameters, so that we make sure that we use new protool parameters a few times
+        // Wait 5 epochs after updating protocol parameters, so that we make sure that we use new protocol parameters a few times
         update_protocol_parameters(self.infrastructure.aggregator_mut()).await?;
         wait_for_epoch_settings(&aggregator_endpoint).await?;
         target_epoch += 5;
@@ -188,7 +188,7 @@ async fn wait_for_target_epoch(
         }
     }) {
         AttemptResult::Ok(_) => {
-            info!("Target epoch reached !"; "target_epoch" => ?target_epoch);
+            info!("Target epoch reached!"; "target_epoch" => ?target_epoch);
             Ok(())
         }
         AttemptResult::Err(error) => Err(error),
@@ -205,7 +205,7 @@ async fn bootstrap_genesis_certificate(aggregator: &mut Aggregator) -> Result<()
 
     info!("> stopping aggregator");
     aggregator.stop().await?;
-    info!("> bootstrapping genesis using signers registered two epochs ago ...");
+    info!("> bootstrapping genesis using signers registered two epochs ago...");
     aggregator.bootstrap_genesis().await?;
     info!("> done, restarting aggregator");
     aggregator.serve()?;
@@ -226,8 +226,16 @@ async fn update_protocol_parameters(aggregator: &mut Aggregator) -> Result<(), S
 
     info!("> stopping aggregator");
     aggregator.stop().await?;
-    info!("> updating protocol parameters ...");
-    aggregator.update_protocol_parameters();
+    let protocol_parameters_new = ProtocolParameters {
+        k: 150,
+        m: 200,
+        phi_f: 0.95,
+    };
+    info!(
+        "> updating protocol parameters to {:?}...",
+        protocol_parameters_new
+    );
+    aggregator.set_protocol_parameters(&protocol_parameters_new);
     info!("> done, restarting aggregator");
     aggregator.serve()?;
 

mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs

@@ -1,6 +1,7 @@
 use crate::devnet::BftNode;
 use crate::utils::MithrilCommand;
 use crate::DEVNET_MAGIC_ID;
+use mithril_common::entities;
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use tokio::process::Child;
@@ -25,9 +26,6 @@ impl Aggregator {
         let server_port_parameter = server_port.to_string();
         let env = HashMap::from([
             ("NETWORK", "devnet"),
-            ("PROTOCOL_PARAMETERS__K", "75"),
-            ("PROTOCOL_PARAMETERS__M", "100"),
-            ("PROTOCOL_PARAMETERS__PHI_F", "0.95"),
             ("RUN_INTERVAL", "800"),
             ("SERVER_IP", "0.0.0.0"),
             ("SERVER_PORT", &server_port_parameter),
@@ -105,11 +103,19 @@ impl Aggregator {
         Ok(())
     }
 
-    pub fn update_protocol_parameters(&mut self) {
-        self.command.set_env_var("PROTOCOL_PARAMETERS__K", "150");
-        self.command.set_env_var("PROTOCOL_PARAMETERS__M", "200");
-        self.command
-            .set_env_var("PROTOCOL_PARAMETERS__PHI_F", "0.95");
+    pub fn set_protocol_parameters(&mut self, protocol_parameters: &entities::ProtocolParameters) {
+        self.command.set_env_var(
+            "PROTOCOL_PARAMETERS__K",
+            &format!("{}", protocol_parameters.k),
+        );
+        self.command.set_env_var(
+            "PROTOCOL_PARAMETERS__M",
+            &format!("{}", protocol_parameters.m),
+        );
+        self.command.set_env_var(
+            "PROTOCOL_PARAMETERS__PHI_F",
+            &format!("{}", protocol_parameters.phi_f),
+        );
     }
 
     pub async fn tail_logs(&self, number_of_line: u64) -> Result<(), String> {

mithril-test-lab/mithril-end-to-end/src/mithril/infrastructure.rs

@@ -1,5 +1,6 @@
 use crate::{Aggregator, Client, Devnet, Signer, DEVNET_MAGIC_ID};
 use mithril_common::chain_observer::{CardanoCliChainObserver, CardanoCliRunner};
+use mithril_common::entities::ProtocolParameters;
 use mithril_common::CardanoNetwork;
 use std::borrow::BorrowMut;
 use std::path::{Path, PathBuf};
@@ -35,6 +36,11 @@ impl MithrilInfrastructure {
             work_dir,
             bin_dir,
         )?;
+        aggregator.set_protocol_parameters(&ProtocolParameters {
+            k: 75,
+            m: 100,
+            phi_f: 0.95,
+        });
         aggregator.serve()?;
 
         let mut signers: Vec<Signer> = vec![];