Skip to content

Commit 8cc25af

Browse files
committed
Fix end to end test to work with new devnet
1 parent 4addf5d commit 8cc25af

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

mithril-test-lab/mithril-end-to-end/src/devnet/runner.rs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,19 @@ impl Devnet {
8484
"SKIP_CARDANO_BIN_DOWNLOAD",
8585
skip_cardano_bin_download.to_string(),
8686
);
87-
let command_args = &[
88-
artifacts_target_dir.to_str().unwrap(),
89-
&number_of_bft_nodes.to_string(),
90-
&number_of_pool_nodes.to_string(),
91-
&cardano_slot_length.to_string(),
92-
&cardano_epoch_length.to_string(),
93-
];
87+
bootstrap_command.env("ARTIFACTS_DIR", artifacts_target_dir.to_str().unwrap());
88+
bootstrap_command.env("NUM_BFT_NODES", number_of_bft_nodes.to_string());
89+
bootstrap_command.env("NUM_POOL_NODES", number_of_pool_nodes.to_string());
90+
bootstrap_command.env("SLOT_LENGTH", cardano_slot_length.to_string());
91+
bootstrap_command.env("EPOCH_LENGTH", cardano_epoch_length.to_string());
92+
bootstrap_command.env("HARD_FORK_LATEST_ERA_AT_EPOCH", "1000"); //TODO: set as configuration parameter
93+
9494
bootstrap_command
9595
.current_dir(devnet_scripts_dir)
96-
.args(command_args)
9796
.stdout(Stdio::null())
9897
.kill_on_drop(true);
9998

100-
info!("Bootstrapping the Devnet"; "script" => &bootstrap_script_path.display(), "args" => #?&command_args);
99+
info!("Bootstrapping the Devnet"; "script" => &bootstrap_script_path.display());
101100

102101
bootstrap_command
103102
.spawn()
@@ -149,7 +148,7 @@ impl Devnet {
149148
.join(format!("node-pool{n}/shelley/kes.skey")),
150149
operational_certificate_path: self
151150
.artifacts_dir
152-
.join(format!("node-pool{n}/shelley/node.cert")),
151+
.join(format!("node-pool{n}/shelley/opcert.cert")),
153152
})
154153
.collect::<Vec<_>>();
155154

@@ -273,7 +272,7 @@ mod tests {
273272
pool_env_path: PathBuf::from(r"test/path/node-pool1/pool.env"),
274273
kes_secret_key_path: PathBuf::from(r"test/path/node-pool1/shelley/kes.skey"),
275274
operational_certificate_path: PathBuf::from(
276-
r"test/path/node-pool1/shelley/node.cert"
275+
r"test/path/node-pool1/shelley/opcert.cert"
277276
),
278277
},],
279278
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl Aggregator {
3333
let magic_id = DEVNET_MAGIC_ID.to_string();
3434
let server_port_parameter = aggregator_config.server_port.to_string();
3535
let era_reader_adapter_params = format!(
36-
r#"{{"markers": [{{"name": "{}", "epoch": 1}}]}}"#,
36+
r#"{{"markers": [{{"name": "{}", "epoch": 0}}]}}"#,
3737
aggregator_config.mithril_era
3838
);
3939
let signed_entity_types = aggregator_config.signed_entity_types.join(",");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl Signer {
2828
let magic_id = DEVNET_MAGIC_ID.to_string();
2929
let data_stores_path = format!("./stores/signer-{party_id}");
3030
let era_reader_adapater_params =
31-
format!(r#"{{"markers": [{{"name": "{mithril_era}", "epoch": 1}}]}}"#);
31+
format!(r#"{{"markers": [{{"name": "{mithril_era}", "epoch": 0}}]}}"#);
3232
let mut env = HashMap::from([
3333
("NETWORK", "devnet"),
3434
("RUN_INTERVAL", "200"),

0 commit comments

Comments
 (0)