Skip to content

Commit

Permalink
Merge pull request #3603 from Zeegomo/increase-slot-duratin
Browse files Browse the repository at this point in the history 
[Tests] increase default slot duration in tests to 2 secs
  • Loading branch information
@dkijania
dkijania committed Oct 11, 2021
2 parents 7b1ee3e + 5ec8949 commit 501d261
Show file tree
Hide file tree
Showing 11 changed files with 10 additions and 30 deletions.
1 change: 0 additions & 1 deletion testing/jormungandr-integration-tests/src/jcli/rest/vote.rs
View file
Expand Up @@ -38,7 +38,6 @@ pub fn test_correct_proposal_number_is_returned() {
.with_slots_per_epoch(60)
.with_certs(vec![vote_plan_cert])
.with_explorer()
.with_slot_duration(1)
.with_treasury(1_000.into())
.build(&temp_dir);

Expand Down
3 changes: 0 additions & 3 deletions testing/jormungandr-integration-tests/src/jormungandr/bft/mempool/v0.rs
View file
Expand Up @@ -103,7 +103,6 @@ pub fn test_mempool_pool_max_entries_equal_0() {
value: 100.into(),
},
])
.with_slot_duration(1)
.with_mempool(Mempool {
pool_max_entries: 0.into(),
log_max_entries: 100.into(),
Expand Down Expand Up @@ -233,7 +232,6 @@ pub fn test_mempool_log_max_entries_equals_0() {
value: 100.into(),
},
])
.with_slot_duration(1)
.with_mempool(Mempool {
pool_max_entries: 0.into(),
log_max_entries: 0.into(),
Expand Down Expand Up @@ -289,7 +287,6 @@ pub fn test_mempool_pool_max_entries_overrides_log_max_entries() {
value: 100.into(),
},
])
.with_slot_duration(1)
.with_mempool(Mempool {
pool_max_entries: 2.into(),
log_max_entries: 0.into(),
Expand Down
4 changes: 0 additions & 4 deletions testing/jormungandr-integration-tests/src/jormungandr/bft/mempool/v1.rs
View file
Expand Up @@ -128,7 +128,6 @@ pub fn test_mempool_pool_max_entries_equal_0() {
value: 100.into(),
},
])
.with_slot_duration(1)
.with_mempool(Mempool {
pool_max_entries: 0.into(),
log_max_entries: 100.into(),
Expand Down Expand Up @@ -212,7 +211,6 @@ pub fn test_mempool_log_max_entries_only_one_fragment() {
value: 100.into(),
},
])
.with_slot_duration(1)
.with_mempool(Mempool {
pool_max_entries: 1.into(),
log_max_entries: 1.into(),
Expand Down Expand Up @@ -308,7 +306,6 @@ pub fn test_mempool_log_max_entries_equals_0() {
value: 100.into(),
},
])
.with_slot_duration(1)
.with_mempool(Mempool {
pool_max_entries: 0.into(),
log_max_entries: 0.into(),
Expand Down Expand Up @@ -393,7 +390,6 @@ pub fn test_mempool_pool_max_entries_overrides_log_max_entries() {
value: 100.into(),
},
])
.with_slot_duration(1)
.with_mempool(Mempool {
pool_max_entries: 2.into(),
log_max_entries: 0.into(),
Expand Down
1 change: 0 additions & 1 deletion testing/jormungandr-integration-tests/src/jormungandr/grpc/client_tests.rs
View file
Expand Up @@ -264,7 +264,6 @@ pub fn upload_block_incompatible_protocol() {
pub fn upload_block_nonexisting_stake_pool() {
let setup = setup::client::bootstrap(
ConfigurationBuilder::new()
.with_slot_duration(1)
.with_block0_consensus(ConsensusVersion::GenesisPraos)
.to_owned(),
);
Expand Down
2 changes: 1 addition & 1 deletion testing/jormungandr-integration-tests/src/jormungandr/grpc/setup.rs
View file
Expand Up @@ -9,7 +9,7 @@ use jormungandr_testing_utils::testing::{
};
use std::net::{IpAddr, Ipv4Addr, SocketAddr};
use std::time::Duration;
const DEFAULT_SLOT_DURATION: u8 = 1;
const DEFAULT_SLOT_DURATION: u8 = 2;
const LOCALHOST: IpAddr = IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1));
pub struct Config {
addr: SocketAddr,
Expand Down
5 changes: 0 additions & 5 deletions testing/jormungandr-integration-tests/src/jormungandr/mempool.rs
View file
Expand Up @@ -35,7 +35,6 @@ pub fn dump_send_correct_fragments() {
ConfigurationBuilder::new()
.with_slots_per_epoch(60)
.with_block_content_max_size(10000)
.with_slot_duration(1)
.with_explorer()
.with_mempool(Mempool {
pool_max_entries: 1_000_000usize.into(),
Expand Down Expand Up @@ -101,7 +100,6 @@ pub fn dump_send_invalid_fragments() {
vec![&sender, &receiver],
ConfigurationBuilder::new()
.with_slots_per_epoch(60)
.with_slot_duration(1)
.with_explorer()
.with_mempool(Mempool {
pool_max_entries: 1_000_000usize.into(),
Expand Down Expand Up @@ -150,7 +148,6 @@ pub fn non_existing_folder() {
vec![&sender, &receiver],
ConfigurationBuilder::new()
.with_slots_per_epoch(60)
.with_slot_duration(1)
.with_explorer()
.with_mempool(Mempool {
pool_max_entries: 1_000_000usize.into(),
Expand Down Expand Up @@ -410,7 +407,6 @@ pub fn expired_fragment_should_be_rejected_by_leader_praos_node() {
ConfigurationBuilder::new()
.with_block_content_max_size(256) // This should only fit 1 transaction
.with_slots_per_epoch(N_FRAGMENTS)
.with_slot_duration(1)
.with_mempool(Mempool {
pool_max_entries: 1000.into(),
log_max_entries: 1000.into(),
Expand Down Expand Up @@ -457,7 +453,6 @@ fn expired_fragment_should_be_rejected_by_passive_bft_node() {
ConfigurationBuilder::new()
.with_block_content_max_size(256) // This should only fit 1 transaction
.with_slots_per_epoch(N_FRAGMENTS)
.with_slot_duration(1)
.with_mempool(Mempool {
pool_max_entries: 1000.into(),
log_max_entries: 1000.into(),
Expand Down
14 changes: 6 additions & 8 deletions testing/jormungandr-integration-tests/src/jormungandr/persistent_log.rs
View file
Expand Up @@ -20,15 +20,13 @@ fn rejected_fragments_have_no_log() {
let (jormungandr, _) = startup::start_stake_pool(
&[sender.clone()],
&[receiver.clone()],
ConfigurationBuilder::new()
.with_slot_duration(1)
.with_mempool(Mempool {
pool_max_entries: 1_000.into(),
log_max_entries: 1_000.into(),
persistent_log: Some(PersistentLog {
dir: log_path.path().to_path_buf(),
}),
ConfigurationBuilder::new().with_mempool(Mempool {
pool_max_entries: 1_000.into(),
log_max_entries: 1_000.into(),
persistent_log: Some(PersistentLog {
dir: log_path.path().to_path_buf(),
}),
}),
)
.unwrap();

Expand Down
2 changes: 0 additions & 2 deletions testing/jormungandr-integration-tests/src/jormungandr/transactions.rs
View file
Expand Up @@ -105,7 +105,6 @@ fn expired_transactions_rejected() {
ConfigurationBuilder::new()
.with_slots_per_epoch(30)
.with_consensus_genesis_praos_active_slot_coeff(ActiveSlotCoefficient::MAXIMUM)
.with_slot_duration(1)
.with_linear_fees(LinearFee::new(0, 0, 0))
.with_mempool(Mempool {
pool_max_entries: 1_000.into(),
Expand Down Expand Up @@ -165,7 +164,6 @@ fn transactions_with_long_time_to_live_rejected() {
ConfigurationBuilder::new()
.with_slots_per_epoch(30)
.with_consensus_genesis_praos_active_slot_coeff(ActiveSlotCoefficient::MAXIMUM)
.with_slot_duration(1)
.with_linear_fees(LinearFee::new(0, 0, 0))
.with_mempool(Mempool {
pool_max_entries: 1_000.into(),
Expand Down
4 changes: 1 addition & 3 deletions testing/jormungandr-integration-tests/src/jormungandr/vit/public.rs
View file
Expand Up @@ -181,7 +181,6 @@ pub fn test_vote_flow_bft() {
.with_slots_per_epoch(60)
.with_certs(vec![vote_plan_cert])
.with_explorer()
.with_slot_duration(1)
.with_treasury(1_000.into())
.build(&temp_dir);

Expand Down Expand Up @@ -314,8 +313,7 @@ pub fn test_vote_flow_praos() {
ActiveSlotCoefficient::new(Milli::from_millis(1_000)).unwrap(),
)
.with_certs(vec![vote_plan_cert])
.with_total_rewards_supply(1_000_000.into())
.with_slot_duration(1);
.with_total_rewards_supply(1_000_000.into());

let (jormungandr, _stake_pools) = start_stake_pool(
&[alice.clone()],
Expand Down
1 change: 0 additions & 1 deletion testing/jormungandr-integration-tests/src/non_functional/persistent_log.rs
View file
Expand Up @@ -22,7 +22,6 @@ pub fn persistent_log_load_test() {
vec![&faucet],
ConfigurationBuilder::new()
.with_slots_per_epoch(60)
.with_slot_duration(1)
.with_explorer()
.with_mempool(Mempool {
pool_max_entries: 1_000_000usize.into(),
Expand Down
3 changes: 2 additions & 1 deletion testing/jormungandr-testing-utils/src/testing/jormungandr/configuration_builder.rs
View file
Expand Up @@ -20,6 +20,7 @@ use jormungandr_lib::interfaces::{
Value,
};
use std::path::PathBuf;
const DEFAULT_SLOT_DURATION: u8 = 2;

#[derive(Clone, Debug)]
pub struct ConfigurationBuilder {
Expand Down Expand Up @@ -65,7 +66,7 @@ impl ConfigurationBuilder {
block0_hash: None,
block0_consensus: ConsensusVersion::Bft,
slots_per_epoch: NumberOfSlotsPerEpoch::new(100).unwrap(),
slot_duration: SlotDuration::new(1).unwrap(),
slot_duration: SlotDuration::new(DEFAULT_SLOT_DURATION).unwrap(),
epoch_stability_depth: 2600u32.into(),
linear_fees: LinearFee::new(0, 0, 0),
consensus_genesis_praos_active_slot_coeff: ActiveSlotCoefficient::MAXIMUM,
Expand Down

0 comments on commit 501d261

Please sign in to comment.