Skip to content

Commit

Permalink
Add missing set_custom_deserializer call from test harness
Browse files Browse the repository at this point in the history
  • Loading branch information
jopemachine committed Jan 7, 2024
1 parent 293e317 commit 490dd96
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
8 changes: 7 additions & 1 deletion harness/src/raft_server.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use futures::future;
use once_cell::sync::Lazy;
use raftify::{Peers, Raft as Raft_, Result};
use raftify::{
raft::derializer::set_custom_deserializer, MyDeserializer, Peers, Raft as Raft_, Result,
};
use slog::{o, Drain};
use slog_envlogger::LogBuilder;
use std::{collections::HashMap, sync::Mutex};
Expand Down Expand Up @@ -55,6 +57,10 @@ fn run_raft(node_id: &u64, peers: Peers) -> Result<JoinHandle<Result<()>>> {
Ok(raft_handle)
}

pub fn setup_test() {
set_custom_deserializer(MyDeserializer::<LogEntry, HashStore>::new());
}

pub async fn run_rafts(peers: Peers) -> Result<()> {
let mut raft_handles = vec![];

Expand Down
3 changes: 2 additions & 1 deletion harness/tests/bootstrap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ use tokio::time::sleep;

use harness::{
constant::{ONE_NODE_EXAMPLE, RAFT_ADDRS, THREE_NODE_EXAMPLE},
raft_server::{handle_bootstrap, run_rafts, spawn_extra_node, RAFTS},
raft_server::{handle_bootstrap, run_rafts, setup_test, spawn_extra_node, RAFTS},
utils::{load_peers, wait_for_until_cluster_size_increase},
};

#[tokio::test]
pub async fn test_static_bootstrap() {
setup_test();
let peers = load_peers(THREE_NODE_EXAMPLE).await.unwrap();
let _raft_tasks = tokio::spawn(run_rafts(peers.clone()));

Expand Down
3 changes: 2 additions & 1 deletion harness/tests/data_replication.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ use tokio::time::sleep;

use harness::{
constant::{RAFT_ADDRS, THREE_NODE_EXAMPLE},
raft_server::{handle_bootstrap, run_rafts, spawn_extra_node, RAFTS},
raft_server::{handle_bootstrap, run_rafts, setup_test, spawn_extra_node, RAFTS},
state_machine::LogEntry,
utils::{load_peers, wait_for_until_cluster_size_increase},
};

#[tokio::test]
pub async fn test_data_replication() {
setup_test();
{
let peers = load_peers(THREE_NODE_EXAMPLE).await.unwrap();
let _raft_tasks = tokio::spawn(run_rafts(peers.clone()));
Expand Down
4 changes: 3 additions & 1 deletion harness/tests/leader_election.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ use tokio::time::sleep;

use harness::{
constant::{FIVE_NODE_EXAMPLE, THREE_NODE_EXAMPLE},
raft_server::{handle_bootstrap, run_rafts, RAFTS},
raft_server::{handle_bootstrap, run_rafts, setup_test, RAFTS},
utils::{
load_peers, wait_for_until_cluster_size_decrease, wait_for_until_cluster_size_increase,
},
};

#[tokio::test]
pub async fn test_leader_election_in_three_node_example() {
setup_test();
let peers = load_peers(THREE_NODE_EXAMPLE).await.unwrap();
let _raft_tasks = tokio::spawn(run_rafts(peers.clone()));

Expand Down Expand Up @@ -44,6 +45,7 @@ pub async fn test_leader_election_in_three_node_example() {
#[tokio::test]
#[ignore]
pub async fn test_leader_election_in_five_node_example() {
setup_test();
let peers = load_peers(FIVE_NODE_EXAMPLE).await.unwrap();
let _raft_tasks = tokio::spawn(run_rafts(peers.clone()));

Expand Down

0 comments on commit 490dd96

Please sign in to comment.