diff --git a/tests/tests/append_entries/t10_conflict_with_empty_entries.rs b/tests/tests/append_entries/t10_conflict_with_empty_entries.rs index ebe37add3..f71e17fdc 100644 --- a/tests/tests/append_entries/t10_conflict_with_empty_entries.rs +++ b/tests/tests/append_entries/t10_conflict_with_empty_entries.rs @@ -7,13 +7,13 @@ use openraft::network::RPCOption; use openraft::network::RaftNetworkFactory; use openraft::raft::AppendEntriesRequest; use openraft::testing::blank_ent; -use openraft::testing::log_id; use openraft::Config; use openraft::Entry; use openraft::EntryPayload; use openraft::Vote; use openraft_memstore::ClientRequest; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/append_entries/t10_see_higher_vote.rs b/tests/tests/append_entries/t10_see_higher_vote.rs index ca2235ad1..e08bbe1d0 100644 --- a/tests/tests/append_entries/t10_see_higher_vote.rs +++ b/tests/tests/append_entries/t10_see_higher_vote.rs @@ -7,13 +7,13 @@ use openraft::network::v2::RaftNetworkV2; use openraft::network::RPCOption; use openraft::network::RaftNetworkFactory; use openraft::raft::VoteRequest; -use openraft::testing::log_id; use openraft::Config; use openraft::ServerState; use openraft::Vote; use openraft_memstore::ClientRequest; use tokio::time::sleep; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/append_entries/t11_append_conflicts.rs b/tests/tests/append_entries/t11_append_conflicts.rs index a03b49c4c..500a79274 100644 --- a/tests/tests/append_entries/t11_append_conflicts.rs +++ b/tests/tests/append_entries/t11_append_conflicts.rs @@ -6,7 +6,6 @@ use maplit::btreeset; use openraft::raft::AppendEntriesRequest; use openraft::storage::RaftLogStorage; use openraft::testing::blank_ent; -use openraft::testing::log_id; use openraft::Config; use openraft::Entry; use openraft::RaftLogReader; @@ -14,6 +13,7 @@ use openraft::RaftTypeConfig; use openraft::ServerState; use openraft::Vote; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/append_entries/t11_append_entries_with_bigger_term.rs b/tests/tests/append_entries/t11_append_entries_with_bigger_term.rs index 92fc421b7..075daeedc 100644 --- a/tests/tests/append_entries/t11_append_entries_with_bigger_term.rs +++ b/tests/tests/append_entries/t11_append_entries_with_bigger_term.rs @@ -7,10 +7,10 @@ use openraft::network::v2::RaftNetworkV2; use openraft::network::RPCOption; use openraft::network::RaftNetworkFactory; use openraft::raft::AppendEntriesRequest; -use openraft::testing::log_id; use openraft::Config; use openraft::Vote; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/append_entries/t11_append_updates_membership.rs b/tests/tests/append_entries/t11_append_updates_membership.rs index 36178be31..f36c313bd 100644 --- a/tests/tests/append_entries/t11_append_updates_membership.rs +++ b/tests/tests/append_entries/t11_append_updates_membership.rs @@ -5,7 +5,6 @@ use anyhow::Result; use maplit::btreeset; use openraft::raft::AppendEntriesRequest; use openraft::testing::blank_ent; -use openraft::testing::log_id; use openraft::Config; use openraft::Entry; use openraft::EntryPayload; @@ -13,6 +12,7 @@ use openraft::Membership; use openraft::ServerState; use openraft::Vote; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/append_entries/t61_heartbeat_reject_vote.rs b/tests/tests/append_entries/t61_heartbeat_reject_vote.rs index baf7e5e46..06e33c010 100644 --- a/tests/tests/append_entries/t61_heartbeat_reject_vote.rs +++ b/tests/tests/append_entries/t61_heartbeat_reject_vote.rs @@ -5,12 +5,12 @@ use std::time::Duration; use anyhow::Result; use maplit::btreeset; use openraft::raft::VoteRequest; -use openraft::testing::log_id; use openraft::Config; use openraft::TokioInstant; use openraft::Vote; use tokio::time::sleep; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/client_api/t10_client_writes.rs b/tests/tests/client_api/t10_client_writes.rs index ea1026365..f73e6e58f 100644 --- a/tests/tests/client_api/t10_client_writes.rs +++ b/tests/tests/client_api/t10_client_writes.rs @@ -4,13 +4,13 @@ use anyhow::Result; use futures::prelude::*; use maplit::btreeset; use openraft::raft::ClientWriteResponse; -use openraft::testing::log_id; use openraft::Config; use openraft::SnapshotPolicy; use openraft_memstore::ClientRequest; use openraft_memstore::IntoMemClientRequest; use openraft_memstore::TypeConfig; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/client_api/t12_trigger_purge_log.rs b/tests/tests/client_api/t12_trigger_purge_log.rs index d34448a3d..e8837936b 100644 --- a/tests/tests/client_api/t12_trigger_purge_log.rs +++ b/tests/tests/client_api/t12_trigger_purge_log.rs @@ -2,10 +2,10 @@ use std::sync::Arc; use std::time::Duration; use maplit::btreeset; -use openraft::testing::log_id; use openraft::Config; use openraft::SnapshotPolicy; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/client_api/t13_get_snapshot.rs b/tests/tests/client_api/t13_get_snapshot.rs index f04c848eb..b69e0223a 100644 --- a/tests/tests/client_api/t13_get_snapshot.rs +++ b/tests/tests/client_api/t13_get_snapshot.rs @@ -2,9 +2,9 @@ use std::sync::Arc; use std::time::Duration; use maplit::btreeset; -use openraft::testing::log_id; use openraft::Config; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/client_api/t13_install_full_snapshot.rs b/tests/tests/client_api/t13_install_full_snapshot.rs index e8d891c02..2bea7747a 100644 --- a/tests/tests/client_api/t13_install_full_snapshot.rs +++ b/tests/tests/client_api/t13_install_full_snapshot.rs @@ -2,10 +2,10 @@ use std::sync::Arc; use std::time::Duration; use maplit::btreeset; -use openraft::testing::log_id; use openraft::Config; use openraft::Vote; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/client_api/t13_trigger_snapshot.rs b/tests/tests/client_api/t13_trigger_snapshot.rs index dd7f1427b..1117664a4 100644 --- a/tests/tests/client_api/t13_trigger_snapshot.rs +++ b/tests/tests/client_api/t13_trigger_snapshot.rs @@ -2,9 +2,9 @@ use std::sync::Arc; use std::time::Duration; use maplit::btreeset; -use openraft::testing::log_id; use openraft::Config; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/client_api/t16_with_raft_state.rs b/tests/tests/client_api/t16_with_raft_state.rs index ac877dfc5..90765c944 100644 --- a/tests/tests/client_api/t16_with_raft_state.rs +++ b/tests/tests/client_api/t16_with_raft_state.rs @@ -3,9 +3,9 @@ use std::sync::Arc; use anyhow::Result; use maplit::btreeset; use openraft::error::Fatal; -use openraft::testing::log_id; use openraft::Config; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/client_api/t16_with_state_machine.rs b/tests/tests/client_api/t16_with_state_machine.rs index 89504ca0f..668007a7e 100644 --- a/tests/tests/client_api/t16_with_state_machine.rs +++ b/tests/tests/client_api/t16_with_state_machine.rs @@ -7,7 +7,6 @@ use openraft::error::Fatal; use openraft::storage::RaftStateMachine; use openraft::storage::Snapshot; use openraft::storage::SnapshotMeta; -use openraft::testing::log_id; use openraft::Config; use openraft::Entry; use openraft::OptionalSend; @@ -18,6 +17,7 @@ use openraft::StoredMembership; use openraft_memstore::ClientResponse; use openraft_memstore::TypeConfig; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::MemStateMachine; use crate::fixtures::RaftRouter; diff --git a/tests/tests/client_api/t51_write_when_leader_quit.rs b/tests/tests/client_api/t51_write_when_leader_quit.rs index 49e4c0a76..e12632d80 100644 --- a/tests/tests/client_api/t51_write_when_leader_quit.rs +++ b/tests/tests/client_api/t51_write_when_leader_quit.rs @@ -7,13 +7,13 @@ use openraft::error::ClientWriteError; use openraft::error::ForwardToLeader; use openraft::error::RaftError; use openraft::raft::AppendEntriesRequest; -use openraft::testing::log_id; use openraft::Config; use openraft::Vote; use openraft_memstore::ClientRequest; use openraft_memstore::IntoMemClientRequest; use tokio::sync::oneshot; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/fixtures/mod.rs b/tests/tests/fixtures/mod.rs index 35e046a23..1af35c8fa 100644 --- a/tests/tests/fixtures/mod.rs +++ b/tests/tests/fixtures/mod.rs @@ -83,6 +83,13 @@ pub type MemStateMachine = Arc; /// A concrete Raft type used during testing. pub type MemRaft = Raft; +pub fn log_id(term: u64, node_id: u64, index: u64) -> LogIdOf { + LogIdOf::::new( + ::LeaderId::new_committed(term, node_id), + index, + ) +} + /// Create a harness that sets up tracing and a tokio runtime for testing. pub fn ut_harness(f: F) -> anyhow::Result<()> where diff --git a/tests/tests/life_cycle/t10_initialization.rs b/tests/tests/life_cycle/t10_initialization.rs index 8edbb636f..824644eb5 100644 --- a/tests/tests/life_cycle/t10_initialization.rs +++ b/tests/tests/life_cycle/t10_initialization.rs @@ -8,7 +8,6 @@ use openraft::error::InitializeError; use openraft::error::NotAllowed; use openraft::error::NotInMembers; use openraft::storage::RaftStateMachine; -use openraft::testing::log_id; use openraft::Config; use openraft::EffectiveMembership; use openraft::EntryPayload; @@ -18,6 +17,7 @@ use openraft::ServerState; use openraft::StoredMembership; use openraft::Vote; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/log_store/t10_save_committed.rs b/tests/tests/log_store/t10_save_committed.rs index 8f91e6a90..f51ebb9a8 100644 --- a/tests/tests/log_store/t10_save_committed.rs +++ b/tests/tests/log_store/t10_save_committed.rs @@ -4,9 +4,9 @@ use std::time::Duration; use anyhow::Result; use maplit::btreeset; use openraft::storage::RaftLogStorage; -use openraft::testing::log_id; use openraft::Config; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/membership/t10_single_node.rs b/tests/tests/membership/t10_single_node.rs index f9d923c50..01a071539 100644 --- a/tests/tests/membership/t10_single_node.rs +++ b/tests/tests/membership/t10_single_node.rs @@ -3,9 +3,9 @@ use std::time::Duration; use anyhow::Result; use maplit::btreeset; -use openraft::testing::log_id; use openraft::Config; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/membership/t11_add_learner.rs b/tests/tests/membership/t11_add_learner.rs index b4ff133ee..02d877e6b 100644 --- a/tests/tests/membership/t11_add_learner.rs +++ b/tests/tests/membership/t11_add_learner.rs @@ -7,7 +7,6 @@ use maplit::btreeset; use openraft::error::ChangeMembershipError; use openraft::error::ClientWriteError; use openraft::error::InProgress; -use openraft::testing::log_id; use openraft::ChangeMembers; use openraft::Config; use openraft::Membership; @@ -15,6 +14,7 @@ use openraft::RaftLogReader; use openraft::StorageHelper; use tokio::time::sleep; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/membership/t31_remove_leader.rs b/tests/tests/membership/t31_remove_leader.rs index 1982601c1..2196c4947 100644 --- a/tests/tests/membership/t31_remove_leader.rs +++ b/tests/tests/membership/t31_remove_leader.rs @@ -4,12 +4,12 @@ use std::time::Duration; use anyhow::Result; use maplit::btreeset; use openraft::error::ClientWriteError; -use openraft::testing::log_id; use openraft::Config; use openraft::ServerState; use openraft_memstore::ClientRequest; use openraft_memstore::IntoMemClientRequest; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/membership/t99_new_leader_auto_commit_uniform_config.rs b/tests/tests/membership/t99_new_leader_auto_commit_uniform_config.rs index 7552d40c6..cf2c8db14 100644 --- a/tests/tests/membership/t99_new_leader_auto_commit_uniform_config.rs +++ b/tests/tests/membership/t99_new_leader_auto_commit_uniform_config.rs @@ -3,13 +3,13 @@ use std::sync::Arc; use anyhow::Result; use maplit::btreeset; use openraft::storage::RaftLogStorageExt; -use openraft::testing::log_id; use openraft::Config; use openraft::Entry; use openraft::EntryPayload; use openraft::Membership; use openraft::Raft; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/metrics/t10_purged.rs b/tests/tests/metrics/t10_purged.rs index b4632c572..f26cdc8ef 100644 --- a/tests/tests/metrics/t10_purged.rs +++ b/tests/tests/metrics/t10_purged.rs @@ -4,9 +4,9 @@ use std::time::Duration; use anyhow::Result; use maplit::btreeset; use openraft::storage::RaftLogStorage; -use openraft::testing::log_id; use openraft::Config; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/metrics/t30_leader_metrics.rs b/tests/tests/metrics/t30_leader_metrics.rs index 8567d5b40..ebdbc7126 100644 --- a/tests/tests/metrics/t30_leader_metrics.rs +++ b/tests/tests/metrics/t30_leader_metrics.rs @@ -4,7 +4,6 @@ use std::time::Duration; use anyhow::Result; use maplit::btreemap; use maplit::btreeset; -use openraft::testing::log_id; use openraft::Config; use openraft::ServerState; #[allow(unused_imports)] @@ -13,6 +12,7 @@ use pretty_assertions::assert_eq; use pretty_assertions::assert_ne; use tokio::time::sleep; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_building/t10_build_snapshot.rs b/tests/tests/snapshot_building/t10_build_snapshot.rs index 937c630d5..2829b2b73 100644 --- a/tests/tests/snapshot_building/t10_build_snapshot.rs +++ b/tests/tests/snapshot_building/t10_build_snapshot.rs @@ -9,7 +9,6 @@ use openraft::network::RaftNetworkFactory; use openraft::raft::AppendEntriesRequest; use openraft::storage::RaftLogStorageExt; use openraft::testing::blank_ent; -use openraft::testing::log_id; use openraft::Config; use openraft::Entry; use openraft::EntryPayload; @@ -18,6 +17,7 @@ use openraft::RaftLogReader; use openraft::SnapshotPolicy; use openraft::Vote; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_building/t35_building_snapshot_does_not_block_append.rs b/tests/tests/snapshot_building/t35_building_snapshot_does_not_block_append.rs index 461c36211..e0a83e2d5 100644 --- a/tests/tests/snapshot_building/t35_building_snapshot_does_not_block_append.rs +++ b/tests/tests/snapshot_building/t35_building_snapshot_does_not_block_append.rs @@ -8,11 +8,11 @@ use openraft::network::RPCOption; use openraft::network::RaftNetworkFactory; use openraft::raft::AppendEntriesRequest; use openraft::testing::blank_ent; -use openraft::testing::log_id; use openraft::Config; use openraft::Vote; use openraft_memstore::BlockOperation; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_building/t35_building_snapshot_does_not_block_apply.rs b/tests/tests/snapshot_building/t35_building_snapshot_does_not_block_apply.rs index bebc4e381..16af57765 100644 --- a/tests/tests/snapshot_building/t35_building_snapshot_does_not_block_apply.rs +++ b/tests/tests/snapshot_building/t35_building_snapshot_does_not_block_apply.rs @@ -8,11 +8,11 @@ use openraft::network::RPCOption; use openraft::network::RaftNetworkFactory; use openraft::raft::AppendEntriesRequest; use openraft::testing::blank_ent; -use openraft::testing::log_id; use openraft::Config; use openraft::Vote; use openraft_memstore::BlockOperation; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_streaming/t10_api_install_snapshot.rs b/tests/tests/snapshot_streaming/t10_api_install_snapshot.rs index a0433efe3..407bba900 100644 --- a/tests/tests/snapshot_streaming/t10_api_install_snapshot.rs +++ b/tests/tests/snapshot_streaming/t10_api_install_snapshot.rs @@ -4,10 +4,10 @@ use anyhow::Result; use maplit::btreeset; use openraft::raft::InstallSnapshotRequest; use openraft::storage::SnapshotMeta; -use openraft::testing::log_id; use openraft::Config; use openraft::Vote; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_streaming/t10_api_install_snapshot_with_lower_vote.rs b/tests/tests/snapshot_streaming/t10_api_install_snapshot_with_lower_vote.rs index 7b5b1d84e..88f062293 100644 --- a/tests/tests/snapshot_streaming/t10_api_install_snapshot_with_lower_vote.rs +++ b/tests/tests/snapshot_streaming/t10_api_install_snapshot_with_lower_vote.rs @@ -7,10 +7,10 @@ use openraft::raft::AppendEntriesRequest; use openraft::raft::InstallSnapshotRequest; use openraft::storage::Snapshot; use openraft::storage::SnapshotMeta; -use openraft::testing::log_id; use openraft::Config; use openraft::Vote; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_streaming/t20_startup_snapshot.rs b/tests/tests/snapshot_streaming/t20_startup_snapshot.rs index c18c6a45b..0db734e85 100644 --- a/tests/tests/snapshot_streaming/t20_startup_snapshot.rs +++ b/tests/tests/snapshot_streaming/t20_startup_snapshot.rs @@ -4,9 +4,9 @@ use std::time::Duration; use maplit::btreeset; use openraft::storage::RaftLogStorage; use openraft::storage::RaftStateMachine; -use openraft::testing::log_id; use openraft::Config; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_streaming/t30_purge_in_snapshot_logs.rs b/tests/tests/snapshot_streaming/t30_purge_in_snapshot_logs.rs index 3cd95271b..208ce8ad5 100644 --- a/tests/tests/snapshot_streaming/t30_purge_in_snapshot_logs.rs +++ b/tests/tests/snapshot_streaming/t30_purge_in_snapshot_logs.rs @@ -3,11 +3,11 @@ use std::time::Duration; use anyhow::Result; use maplit::btreeset; -use openraft::testing::log_id; use openraft::Config; use openraft::RaftLogReader; use tokio::time::sleep; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_streaming/t31_snapshot_overrides_membership.rs b/tests/tests/snapshot_streaming/t31_snapshot_overrides_membership.rs index e3ed2a5b3..d9e72c0ca 100644 --- a/tests/tests/snapshot_streaming/t31_snapshot_overrides_membership.rs +++ b/tests/tests/snapshot_streaming/t31_snapshot_overrides_membership.rs @@ -9,7 +9,6 @@ use openraft::network::RaftNetworkFactory; use openraft::raft::AppendEntriesRequest; use openraft::storage::StorageHelper; use openraft::testing::blank_ent; -use openraft::testing::log_id; use openraft::Config; use openraft::EffectiveMembership; use openraft::Entry; @@ -18,6 +17,7 @@ use openraft::Membership; use openraft::SnapshotPolicy; use openraft::Vote; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_streaming/t32_snapshot_uses_prev_snap_membership.rs b/tests/tests/snapshot_streaming/t32_snapshot_uses_prev_snap_membership.rs index f1d17e156..bfddde782 100644 --- a/tests/tests/snapshot_streaming/t32_snapshot_uses_prev_snap_membership.rs +++ b/tests/tests/snapshot_streaming/t32_snapshot_uses_prev_snap_membership.rs @@ -3,13 +3,13 @@ use std::time::Duration; use anyhow::Result; use maplit::btreeset; -use openraft::testing::log_id; use openraft::Config; use openraft::Membership; use openraft::RaftLogReader; use openraft::SnapshotPolicy; use openraft::StorageHelper; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_streaming/t33_snapshot_delete_conflict_logs.rs b/tests/tests/snapshot_streaming/t33_snapshot_delete_conflict_logs.rs index 650bc5ef1..052ae8bcd 100644 --- a/tests/tests/snapshot_streaming/t33_snapshot_delete_conflict_logs.rs +++ b/tests/tests/snapshot_streaming/t33_snapshot_delete_conflict_logs.rs @@ -11,7 +11,6 @@ use openraft::storage::RaftLogStorage; use openraft::storage::RaftLogStorageExt; use openraft::storage::RaftStateMachine; use openraft::testing::blank_ent; -use openraft::testing::log_id; use openraft::testing::membership_ent; use openraft::Config; use openraft::Entry; @@ -24,6 +23,7 @@ use openraft::SnapshotPolicy; use openraft::StorageHelper; use openraft::Vote; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_streaming/t34_replication_does_not_block_purge.rs b/tests/tests/snapshot_streaming/t34_replication_does_not_block_purge.rs index 091ccf170..28c09f460 100644 --- a/tests/tests/snapshot_streaming/t34_replication_does_not_block_purge.rs +++ b/tests/tests/snapshot_streaming/t34_replication_does_not_block_purge.rs @@ -3,11 +3,11 @@ use std::time::Duration; use anyhow::Result; use maplit::btreeset; -use openraft::testing::log_id; use openraft::Config; use openraft::RaftLogReader; use tokio::time::sleep; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_streaming/t50_snapshot_line_rate_to_snapshot.rs b/tests/tests/snapshot_streaming/t50_snapshot_line_rate_to_snapshot.rs index a59f174ce..a9a77ea87 100644 --- a/tests/tests/snapshot_streaming/t50_snapshot_line_rate_to_snapshot.rs +++ b/tests/tests/snapshot_streaming/t50_snapshot_line_rate_to_snapshot.rs @@ -3,10 +3,10 @@ use std::time::Duration; use anyhow::Result; use maplit::btreeset; -use openraft::testing::log_id; use openraft::Config; use openraft::SnapshotPolicy; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_streaming/t50_snapshot_when_lacking_log.rs b/tests/tests/snapshot_streaming/t50_snapshot_when_lacking_log.rs index 2052b0deb..58dd0fdb0 100644 --- a/tests/tests/snapshot_streaming/t50_snapshot_when_lacking_log.rs +++ b/tests/tests/snapshot_streaming/t50_snapshot_when_lacking_log.rs @@ -2,10 +2,10 @@ use std::sync::Arc; use anyhow::Result; use maplit::btreeset; -use openraft::testing::log_id; use openraft::Config; use openraft::SnapshotPolicy; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_streaming/t51_after_snapshot_add_learner_and_request_a_log.rs b/tests/tests/snapshot_streaming/t51_after_snapshot_add_learner_and_request_a_log.rs index 234743c50..17bdc8e22 100644 --- a/tests/tests/snapshot_streaming/t51_after_snapshot_add_learner_and_request_a_log.rs +++ b/tests/tests/snapshot_streaming/t51_after_snapshot_add_learner_and_request_a_log.rs @@ -3,10 +3,10 @@ use std::time::Duration; use anyhow::Result; use maplit::btreeset; -use openraft::testing::log_id; use openraft::Config; use openraft::SnapshotPolicy; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_streaming/t60_snapshot_chunk_size.rs b/tests/tests/snapshot_streaming/t60_snapshot_chunk_size.rs index 4c463b38e..7a497ef8f 100644 --- a/tests/tests/snapshot_streaming/t60_snapshot_chunk_size.rs +++ b/tests/tests/snapshot_streaming/t60_snapshot_chunk_size.rs @@ -3,11 +3,11 @@ use std::time::Duration; use anyhow::Result; use maplit::btreeset; -use openraft::testing::log_id; use openraft::Config; use openraft::ServerState; use openraft::SnapshotPolicy; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/snapshot_streaming/t90_issue_808_snapshot_to_unreachable_node_should_not_block.rs b/tests/tests/snapshot_streaming/t90_issue_808_snapshot_to_unreachable_node_should_not_block.rs index a9d4294f2..8422d40d7 100644 --- a/tests/tests/snapshot_streaming/t90_issue_808_snapshot_to_unreachable_node_should_not_block.rs +++ b/tests/tests/snapshot_streaming/t90_issue_808_snapshot_to_unreachable_node_should_not_block.rs @@ -3,9 +3,9 @@ use std::time::Duration; use anyhow::Result; use maplit::btreeset; -use openraft::testing::log_id; use openraft::Config; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter; diff --git a/tests/tests/state_machine/t20_state_machine_apply_membership.rs b/tests/tests/state_machine/t20_state_machine_apply_membership.rs index dba3e3707..5963c3963 100644 --- a/tests/tests/state_machine/t20_state_machine_apply_membership.rs +++ b/tests/tests/state_machine/t20_state_machine_apply_membership.rs @@ -3,12 +3,12 @@ use std::sync::Arc; use anyhow::Result; use maplit::btreeset; use openraft::storage::RaftStateMachine; -use openraft::testing::log_id; use openraft::Config; use openraft::LogIdOptionExt; use openraft::Membership; use openraft::StoredMembership; +use crate::fixtures::log_id; use crate::fixtures::ut_harness; use crate::fixtures::RaftRouter;