Skip to content

Commit 6c2d688

Browse files
authored
fix for all tests under sanity-non-functional and soak-non-functional features (#1619)
1 parent 7e236eb commit 6c2d688

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

jormungandr-integration-tests/src/non_functional/sanity.rs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::common::{
55
jormungandr::ConfigurationBuilder,
66
startup,
77
};
8-
use jormungandr_lib::interfaces::Value;
8+
use jormungandr_lib::interfaces::{ActiveSlotCoefficient, KESUpdateSpeed, Value};
99
use std::iter;
1010
use std::time::SystemTime;
1111

@@ -35,9 +35,9 @@ fn send_100_transaction_in_10_packs_for_recievers(
3535
&[sender.clone()],
3636
ConfigurationBuilder::new()
3737
.with_slots_per_epoch(60)
38-
.with_consensus_genesis_praos_active_slot_coeff("0.999")
38+
.with_consensus_genesis_praos_active_slot_coeff(ActiveSlotCoefficient::MAXIMUM)
3939
.with_slot_duration(2)
40-
.with_kes_update_speed(43200),
40+
.with_kes_update_speed(KESUpdateSpeed::new(43200).unwrap()),
4141
)
4242
.unwrap();
4343

@@ -72,9 +72,9 @@ pub fn test_100_transaction_is_processed() {
7272
&[sender.clone()],
7373
ConfigurationBuilder::new()
7474
.with_slots_per_epoch(60)
75-
.with_consensus_genesis_praos_active_slot_coeff("0.999")
75+
.with_consensus_genesis_praos_active_slot_coeff(ActiveSlotCoefficient::MAXIMUM)
7676
.with_slot_duration(4)
77-
.with_kes_update_speed(43200),
77+
.with_kes_update_speed(KESUpdateSpeed::new(43200).unwrap()),
7878
)
7979
.unwrap();
8080

@@ -91,8 +91,7 @@ pub fn test_100_transaction_is_processed() {
9191

9292
sender.confirm_transaction();
9393

94-
let fragment_id =
95-
jcli_wrapper::assert_transaction_in_block(&transaction, &jormungandr.rest_address());
94+
jcli_wrapper::assert_transaction_in_block(&transaction, &jormungandr.rest_address());
9695

9796
assert_funds_transferred_to(&receiver.address, i.into(), &jormungandr.rest_address());
9897
jormungandr.assert_no_errors_in_log();
@@ -121,10 +120,10 @@ pub fn test_blocks_are_being_created_for_more_than_15_minutes() {
121120
&[sender.clone()],
122121
ConfigurationBuilder::new()
123122
.with_slots_per_epoch(60)
124-
.with_consensus_genesis_praos_active_slot_coeff("0.999")
123+
.with_consensus_genesis_praos_active_slot_coeff(ActiveSlotCoefficient::MAXIMUM)
125124
.with_slot_duration(4)
126125
.with_epoch_stability_depth(10)
127-
.with_kes_update_speed(43200),
126+
.with_kes_update_speed(KESUpdateSpeed::new(43200).unwrap()),
128127
)
129128
.unwrap();
130129

@@ -142,8 +141,7 @@ pub fn test_blocks_are_being_created_for_more_than_15_minutes() {
142141

143142
sender.confirm_transaction();
144143

145-
let fragment_id =
146-
jcli_wrapper::assert_transaction_in_block(&transaction, &jormungandr.rest_address());
144+
jcli_wrapper::assert_transaction_in_block(&transaction, &jormungandr.rest_address());
147145

148146
// 900 s = 15 minutes
149147
if now.elapsed().unwrap().as_secs() > 900 {

jormungandr-integration-tests/src/non_functional/soak.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
#![cfg(feature = "soak-non-functional")]
22
use crate::common::{
3-
configuration::genesis_model::Fund,
4-
data::address::Account,
53
jcli_wrapper::{self, jcli_transaction_wrapper::JCLITransactionWrapper},
6-
jormungandr::{ConfigurationBuilder, Starter},
4+
jormungandr::ConfigurationBuilder,
75
process_utils::Wait,
86
startup,
97
};
108

11-
use jormungandr_lib::interfaces::{Mempool, UTxOInfo};
12-
use std::iter;
9+
use jormungandr_lib::interfaces::{ActiveSlotCoefficient, KESUpdateSpeed, Mempool};
1310
use std::time::{Duration, SystemTime};
1411

1512
#[test]
@@ -22,9 +19,9 @@ pub fn test_blocks_are_being_created_for_48_hours() {
2219
&[sender.clone()],
2320
ConfigurationBuilder::new()
2421
.with_slots_per_epoch(20)
25-
.with_consensus_genesis_praos_active_slot_coeff("0.999")
22+
.with_consensus_genesis_praos_active_slot_coeff(ActiveSlotCoefficient::MAXIMUM)
2623
.with_slot_duration(3)
27-
.with_kes_update_speed(43200)
24+
.with_kes_update_speed(KESUpdateSpeed::new(43200).unwrap())
2825
.with_mempool(Mempool {
2926
pool_max_entries: 1_000_000usize.into(),
3027
fragment_ttl: duration_48_hours.clone().into(),

0 commit comments

Comments
 (0)