Skip to content

Commit 792b295

Browse files
committed
feat: support Cardano node version configuration in end to end test
1 parent e19d586 commit 792b295

File tree

5 files changed

+17
-2
lines changed

5 files changed

+17
-2
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ pub struct DevnetBootstrapArgs {
6161
pub number_of_pool_nodes: u8,
6262
pub cardano_slot_length: f64,
6363
pub cardano_epoch_length: f64,
64+
pub cardano_node_version: String,
6465
pub cardano_hard_fork_latest_era_at_epoch: u16,
6566
pub skip_cardano_bin_download: bool,
6667
}
@@ -110,6 +111,7 @@ impl Devnet {
110111
"EPOCH_LENGTH",
111112
bootstrap_args.cardano_epoch_length.to_string(),
112113
);
114+
bootstrap_command.env("CARDANO_NODE_VERSION", &bootstrap_args.cardano_node_version);
113115
bootstrap_command.env(
114116
"CARDANO_HARD_FORK_LATEST_ERA_AT_EPOCH",
115117
bootstrap_args
@@ -290,7 +292,7 @@ impl Devnet {
290292
.with_context(|| "Failed to write era marker on chain")?
291293
.wait()
292294
.await
293-
.with_context(|| "Error while writin era marker on chain")?;
295+
.with_context(|| "Error while writing era marker on chain")?;
294296
match status.code() {
295297
Some(0) => Ok(()),
296298
Some(code) => Err(anyhow!(

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ pub struct Args {
5454
#[clap(long, default_value_t = 30.0)]
5555
cardano_epoch_length: f64,
5656

57+
/// Cardano node version
58+
#[clap(long, default_value = "8.7.3")]
59+
cardano_node_version: String,
60+
5761
/// Epoch at which hard fork to the latest Cardano era will be made (starts with the latest era by default)
5862
#[clap(long, default_value_t = 0)]
5963
cardano_hard_fork_latest_era_at_epoch: u16,
@@ -133,6 +137,7 @@ async fn main() -> StdResult<()> {
133137
number_of_pool_nodes: args.number_of_pool_nodes,
134138
cardano_slot_length: args.cardano_slot_length,
135139
cardano_epoch_length: args.cardano_epoch_length,
140+
cardano_node_version: args.cardano_node_version.to_owned(),
136141
cardano_hard_fork_latest_era_at_epoch: args.cardano_hard_fork_latest_era_at_epoch,
137142
skip_cardano_bin_download: args.skip_cardano_bin_download,
138143
})
@@ -143,6 +148,7 @@ async fn main() -> StdResult<()> {
143148
devnet: devnet.clone(),
144149
work_dir,
145150
bin_dir: args.bin_directory,
151+
cardano_node_version: args.cardano_node_version,
146152
mithril_era: args.mithril_era,
147153
mithril_era_reader_adapter: args.mithril_era_reader_adapter,
148154
signed_entity_types: args.signed_entity_types,

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ pub struct AggregatorConfig<'a> {
1919
pub cardano_cli_path: &'a Path,
2020
pub work_dir: &'a Path,
2121
pub bin_dir: &'a Path,
22+
pub cardano_node_version: &'a str,
2223
pub mithril_era: &'a str,
2324
pub mithril_era_reader_adapter: &'a str,
2425
pub mithril_era_marker_address: &'a str,
@@ -78,7 +79,10 @@ impl Aggregator {
7879
),
7980
("ERA_READER_ADAPTER_PARAMS", &era_reader_adapter_params),
8081
("SIGNED_ENTITY_TYPES", &signed_entity_types),
81-
("CARDANO_NODE_VERSION", "8.7.3"),
82+
(
83+
"CARDANO_NODE_VERSION",
84+
aggregator_config.cardano_node_version,
85+
),
8286
("CHAIN_OBSERVER_TYPE", aggregator_config.chain_observer_type),
8387
]);
8488
let args = vec![

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ pub struct MithrilInfrastructureConfig {
2020
pub devnet: Devnet,
2121
pub work_dir: PathBuf,
2222
pub bin_dir: PathBuf,
23+
pub cardano_node_version: String,
2324
pub mithril_era: String,
2425
pub mithril_era_reader_adapter: String,
2526
pub signed_entity_types: Vec<String>,
@@ -54,6 +55,7 @@ impl MithrilInfrastructure {
5455
cardano_cli_path: &config.devnet.cardano_cli_path(),
5556
work_dir: &config.work_dir,
5657
bin_dir: &config.bin_dir,
58+
cardano_node_version: &config.cardano_node_version,
5759
mithril_era: &config.mithril_era,
5860
mithril_era_reader_adapter: &config.mithril_era_reader_adapter,
5961
mithril_era_marker_address: &config.devnet.mithril_era_marker_address()?,

mithril-test-lab/mithril-end-to-end/src/stress_test/aggregator_helpers.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ pub async fn bootstrap_aggregator(
2424
cardano_cli_path: &args.cardano_cli_path,
2525
work_dir: &args.work_dir,
2626
bin_dir: &args.bin_dir,
27+
cardano_node_version: "1.2.3",
2728
mithril_era: &args.mithril_era,
2829
mithril_era_marker_address: "",
2930
mithril_era_reader_adapter: "dummy",

0 commit comments

Comments
 (0)