remove from more tests

input-output-hk · Jun 4, 2021 · 68764c7 · 68764c7
1 parent 384e6e3
commit 68764c7
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 47 deletions.
diff --git a/testing/jormungandr-integration-tests/src/jormungandr/bft/mempool/v0.rs b/testing/jormungandr-integration-tests/src/jormungandr/bft/mempool/v0.rs
@@ -26,7 +26,6 @@ pub fn test_mempool_pool_max_entries_limit() {
                 value: 100.into(),
             },
         ])
-        .with_explorer()
         .with_slot_duration(2)
         .with_mempool(Mempool {
             pool_max_entries: 1.into(),
@@ -89,7 +88,6 @@ pub fn test_mempool_pool_max_entries_equal_0() {
                 value: 100.into(),
             },
         ])
-        .with_explorer()
         .with_slot_duration(1)
         .with_mempool(Mempool {
             pool_max_entries: 0.into(),
@@ -146,7 +144,6 @@ pub fn test_mempool_log_max_entries_only_one_fragment() {
                 value: 100.into(),
             },
         ])
-        .with_explorer()
         .with_slot_duration(1)
         .with_mempool(Mempool {
             pool_max_entries: 1.into(),
@@ -209,7 +206,6 @@ pub fn test_mempool_log_max_entries_equals_0() {
                 value: 100.into(),
             },
         ])
-        .with_explorer()
         .with_slot_duration(1)
         .with_mempool(Mempool {
             pool_max_entries: 0.into(),
@@ -267,7 +263,6 @@ pub fn test_mempool_pool_max_entries_overrides_log_max_entries() {
                 value: 100.into(),
             },
         ])
-        .with_explorer()
         .with_slot_duration(1)
         .with_mempool(Mempool {
             pool_max_entries: 2.into(),

diff --git a/testing/jormungandr-integration-tests/src/jormungandr/bft/mempool/v1.rs b/testing/jormungandr-integration-tests/src/jormungandr/bft/mempool/v1.rs
@@ -26,7 +26,6 @@ pub fn test_mempool_pool_max_entries_limit() {
                 value: 100.into(),
             },
         ])
-        .with_explorer()
         .with_slot_duration(2)
         .with_mempool(Mempool {
             pool_max_entries: 1.into(),
@@ -109,7 +108,6 @@ pub fn test_mempool_pool_max_entries_equal_0() {
                 value: 100.into(),
             },
         ])
-        .with_explorer()
         .with_slot_duration(1)
         .with_mempool(Mempool {
             pool_max_entries: 0.into(),
@@ -186,7 +184,6 @@ pub fn test_mempool_log_max_entries_only_one_fragment() {
                 value: 100.into(),
             },
         ])
-        .with_explorer()
         .with_slot_duration(1)
         .with_mempool(Mempool {
             pool_max_entries: 1.into(),
@@ -269,7 +266,6 @@ pub fn test_mempool_log_max_entries_equals_0() {
                 value: 100.into(),
             },
         ])
-        .with_explorer()
         .with_slot_duration(1)
         .with_mempool(Mempool {
             pool_max_entries: 0.into(),
@@ -347,7 +343,6 @@ pub fn test_mempool_pool_max_entries_overrides_log_max_entries() {
                 value: 100.into(),
             },
         ])
-        .with_explorer()
         .with_slot_duration(1)
         .with_mempool(Mempool {
             pool_max_entries: 2.into(),

diff --git a/testing/jormungandr-integration-tests/src/jormungandr/explorer/mod.rs b/testing/jormungandr-integration-tests/src/jormungandr/explorer/mod.rs
@@ -22,7 +22,7 @@ pub fn explorer_schema_diff_test() {
     use assert_fs::{fixture::PathChild, TempDir};
 
     let temp_dir = TempDir::new().unwrap();
-    let config = ConfigurationBuilder::new().with_explorer().build(&temp_dir);
+    let config = ConfigurationBuilder::new().build(&temp_dir);
 
     let jormungandr = Starter::new()
         .temp_dir(temp_dir)
@@ -60,9 +60,7 @@ pub fn explorer_sanity_test() {
     let receiver = startup::create_new_account_address();
 
     let mut config = ConfigurationBuilder::new();
-    config
-        .with_consensus_genesis_praos_active_slot_coeff(ActiveSlotCoefficient::MAXIMUM)
-        .with_explorer();
+    config.with_consensus_genesis_praos_active_slot_coeff(ActiveSlotCoefficient::MAXIMUM);
 
     let (jormungandr, initial_stake_pools) =
         startup::start_stake_pool(&[faucet.clone()], &[], &mut config).unwrap();

diff --git a/testing/jormungandr-integration-tests/src/jormungandr/fragments.rs b/testing/jormungandr-integration-tests/src/jormungandr/fragments.rs
@@ -27,7 +27,6 @@ pub fn send_all_fragments() {
             .with_consensus_genesis_praos_active_slot_coeff(ActiveSlotCoefficient::MAXIMUM)
             .with_slot_duration(3)
             .with_linear_fees(LinearFee::new(1, 1, 1))
-            .with_explorer()
             .with_mempool(Mempool {
                 pool_max_entries: 1_000_000usize.into(),
                 log_max_entries: 1_000_000usize.into(),

diff --git a/testing/jormungandr-integration-tests/src/jormungandr/genesis/rewards.rs b/testing/jormungandr-integration-tests/src/jormungandr/genesis/rewards.rs
@@ -28,8 +28,7 @@ pub fn collect_reward() {
             .with_slots_per_epoch(20)
             .with_consensus_genesis_praos_active_slot_coeff(ActiveSlotCoefficient::MAXIMUM)
             .with_slot_duration(3)
-            .with_total_rewards_supply(1_000_000.into())
-            .with_explorer(),
+            .with_total_rewards_supply(1_000_000.into()),
     )
     .unwrap();
 

diff --git a/testing/jormungandr-integration-tests/src/jormungandr/mempool/fragments_dump.rs b/testing/jormungandr-integration-tests/src/jormungandr/mempool/fragments_dump.rs
@@ -32,7 +32,6 @@ pub fn dump_send_correct_fragments() {
         ConfigurationBuilder::new()
             .with_slots_per_epoch(60)
             .with_slot_duration(1)
-            .with_explorer()
             .with_mempool(Mempool {
                 pool_max_entries: 1_000_000usize.into(),
                 log_max_entries: 1_000_000usize.into(),
@@ -93,7 +92,6 @@ pub fn dump_send_invalid_fragments() {
         ConfigurationBuilder::new()
             .with_slots_per_epoch(60)
             .with_slot_duration(1)
-            .with_explorer()
             .with_mempool(Mempool {
                 pool_max_entries: 1_000_000usize.into(),
                 log_max_entries: 1_000_000usize.into(),
@@ -141,7 +139,6 @@ pub fn non_existing_folder() {
         ConfigurationBuilder::new()
             .with_slots_per_epoch(60)
             .with_slot_duration(1)
-            .with_explorer()
             .with_mempool(Mempool {
                 pool_max_entries: 1_000_000usize.into(),
                 log_max_entries: 1_000_000usize.into(),
@@ -193,7 +190,6 @@ pub fn fragment_which_reached_mempool_should_be_persisted() {
         ConfigurationBuilder::new()
             .with_slots_per_epoch(60)
             .with_slot_duration(3)
-            .with_explorer()
             .with_mempool(Mempool {
                 pool_max_entries: 1usize.into(),
                 log_max_entries: 1000usize.into(),
@@ -232,7 +228,6 @@ pub fn fragment_which_is_not_in_fragment_log_should_be_persisted() {
         ConfigurationBuilder::new()
             .with_slots_per_epoch(60)
             .with_slot_duration(3)
-            .with_explorer()
             .with_mempool(Mempool {
                 pool_max_entries: 1000usize.into(),
                 log_max_entries: 1usize.into(),
@@ -271,7 +266,6 @@ pub fn pending_fragment_should_be_persisted() {
         ConfigurationBuilder::new()
             .with_slots_per_epoch(5)
             .with_slot_duration(60)
-            .with_explorer()
             .with_mempool(Mempool {
                 pool_max_entries: 10usize.into(),
                 log_max_entries: 10usize.into(),
@@ -315,7 +309,6 @@ pub fn node_should_pickup_log_after_restart() {
     let config = ConfigurationBuilder::new()
         .with_slots_per_epoch(60)
         .with_slot_duration(3)
-        .with_explorer()
         .with_mempool(Mempool {
             pool_max_entries: 1usize.into(),
             log_max_entries: 1000usize.into(),

diff --git a/testing/jormungandr-integration-tests/src/jormungandr/vit/private.rs b/testing/jormungandr-integration-tests/src/jormungandr/vit/private.rs
@@ -83,7 +83,6 @@ pub fn jcli_e2e_flow_private_vote() {
     let vote_plan_cert = jcli.certificate().new_vote_plan(vote_plan_json.path());
 
     let config = ConfigurationBuilder::new()
-        .with_explorer()
         .with_funds(vec![
             alice.to_initial_fund(wallet_initial_funds),
             bob.to_initial_fund(wallet_initial_funds),

diff --git a/testing/jormungandr-integration-tests/src/jormungandr/vit/public.rs b/testing/jormungandr-integration-tests/src/jormungandr/vit/public.rs
@@ -159,7 +159,6 @@ pub fn test_vote_flow_bft() {
         .with_committees(&wallets)
         .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);
@@ -376,7 +375,6 @@ pub fn jcli_e2e_flow() {
     vote_plan_json.write_str(&vote_plan.as_json_str()).unwrap();
 
     let config = ConfigurationBuilder::new()
-        .with_explorer()
         .with_funds(vec![
             alice.to_initial_fund(1_000_000),
             bob.to_initial_fund(1_000_000),

diff --git a/testing/jormungandr-integration-tests/src/networking/p2p.rs b/testing/jormungandr-integration-tests/src/networking/p2p.rs
@@ -4,9 +4,7 @@ use crate::common::{
 };
 
 use jormungandr_lib::{
-    interfaces::{
-        Explorer, PeerRecord, Policy, PreferredListConfig, TopicsOfInterest, TrustedPeer,
-    },
+    interfaces::{PeerRecord, Policy, PreferredListConfig, TopicsOfInterest, TrustedPeer},
     time::Duration,
 };
 use jormungandr_testing_utils::testing::network_builder::SpawnParams;
@@ -130,9 +128,6 @@ pub fn node_whitelist_itself() {
             wallet("delegated1").with(1_000_000).delegated_to(CLIENT),
             wallet("delegated2").with(1_000_000).delegated_to(SERVER),
         ])
-        .custom_config(vec![
-            SpawnParams::new(CLIENT).explorer(Explorer { enabled: true })
-        ])
         .build()
         .unwrap();
 
@@ -162,9 +157,6 @@ pub fn node_does_not_quarantine_whitelisted_node() {
             wallet("delegated1").with(1_000_000).delegated_to(CLIENT),
             wallet("delegated2").with(1_000_000).delegated_to(SERVER),
         ])
-        .custom_config(vec![
-            SpawnParams::new(CLIENT).explorer(Explorer { enabled: true })
-        ])
         .build()
         .unwrap();
 
@@ -205,9 +197,6 @@ pub fn node_put_in_quarantine_nodes_which_are_not_whitelisted() {
             wallet("delegated1").with(1_000_000).delegated_to(CLIENT),
             wallet("delegated2").with(1_000_000).delegated_to(SERVER),
         ])
-        .custom_config(vec![
-            SpawnParams::new(CLIENT).explorer(Explorer { enabled: true })
-        ])
         .build()
         .unwrap();
 
@@ -264,9 +253,6 @@ pub fn node_trust_itself() {
             wallet("delegated1").with(1_000_000).delegated_to(CLIENT),
             wallet("delegated2").with(1_000_000).delegated_to(SERVER),
         ])
-        .custom_config(vec![
-            SpawnParams::new(CLIENT).explorer(Explorer { enabled: true })
-        ])
         .build()
         .unwrap();
 

diff --git a/testing/jormungandr-integration-tests/src/non_functional/persistent_log.rs b/testing/jormungandr-integration-tests/src/non_functional/persistent_log.rs
@@ -22,7 +22,6 @@ pub fn persistent_log_load_test() {
         ConfigurationBuilder::new()
             .with_slots_per_epoch(60)
             .with_slot_duration(1)
-            .with_explorer()
             .with_mempool(Mempool {
                 pool_max_entries: 1_000_000usize.into(),
                 log_max_entries: 1_000_000usize.into(),

diff --git a/testing/jormungandr-integration-tests/src/non_functional/voting/private/mod.rs b/testing/jormungandr-integration-tests/src/non_functional/voting/private/mod.rs
@@ -96,7 +96,6 @@ pub fn private_vote_load_scenario(quick_config: PrivateVotingLoadTestConfig) {
         .with_committees(&[&committee])
         .with_slots_per_epoch(quick_config.slots_in_epoch())
         .with_certs(vec![vote_plan_cert])
-        .with_explorer()
         .with_slot_duration(quick_config.slot_duration())
         .with_block_content_max_size(quick_config.block_content_max_size())
         .with_treasury(1_000.into())
@@ -269,7 +268,6 @@ pub fn adversary_private_vote_load_scenario(
         .with_committees(&[&committee])
         .with_slots_per_epoch(quick_config.slots_in_epoch())
         .with_certs(vec![vote_plan_cert])
-        .with_explorer()
         .with_slot_duration(quick_config.slot_duration())
         .with_block_content_max_size(quick_config.block_content_max_size())
         .with_treasury(1_000.into())

diff --git a/testing/jormungandr-integration-tests/src/non_functional/voting/public/mod.rs b/testing/jormungandr-integration-tests/src/non_functional/voting/public/mod.rs
@@ -73,7 +73,6 @@ pub fn public_vote_load_scenario(quick_config: PublicVotingLoadTestConfig) {
         .with_committees(&[&committee])
         .with_slots_per_epoch(quick_config.slots_in_epoch())
         .with_certs(vec![vote_plan_cert])
-        .with_explorer()
         .with_slot_duration(quick_config.slot_duration())
         .with_treasury(1_000.into())
         .build(&temp_dir);
@@ -208,7 +207,6 @@ pub fn adversary_public_vote_load_scenario(
         .with_committees(&[&committee])
         .with_slots_per_epoch(quick_config.slots_in_epoch())
         .with_certs(vec![vote_plan_cert])
-        .with_explorer()
         .with_slot_duration(quick_config.slot_duration())
         .with_block_content_max_size(quick_config.block_content_max_size())
         .with_treasury(1_000.into())