From 8d89b0ec9bd4853b1cc223783a37e0b75bb5e63c Mon Sep 17 00:00:00 2001 From: bsbds <69835502+bsbds@users.noreply.github.com> Date: Tue, 5 Mar 2024 20:16:12 +0800 Subject: [PATCH] refactor: madsim Signed-off-by: bsbds <69835502+bsbds@users.noreply.github.com> --- crates/curp/src/server/mod.rs | 4 ++++ crates/simulation/src/curp_group.rs | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/crates/curp/src/server/mod.rs b/crates/curp/src/server/mod.rs index 1886d0462..b6fca3a99 100644 --- a/crates/curp/src/server/mod.rs +++ b/crates/curp/src/server/mod.rs @@ -292,6 +292,8 @@ impl Rpc { storage: Arc>, task_manager: Arc, client_tls_config: Option, + sps: Vec>, + ucps: Vec>, ) -> Result<(), crate::error::ServerError> where CE: CommandExecutor, @@ -311,6 +313,8 @@ impl Rpc { storage, task_manager, client_tls_config, + sps, + ucps, ) .await; diff --git a/crates/simulation/src/curp_group.rs b/crates/simulation/src/curp_group.rs index 68488723f..ebca5fa2b 100644 --- a/crates/simulation/src/curp_group.rs +++ b/crates/simulation/src/curp_group.rs @@ -12,7 +12,10 @@ use curp::{ ConfChange, FetchClusterRequest, FetchClusterResponse, Member, ProposeConfChangeRequest, ProposeConfChangeResponse, ReadState, }, - server::{Rpc, StorageApi, DB}, + server::{ + conflict::test_pools::{TestSpecPool, TestUncomPool}, + Rpc, StorageApi, DB, + }, LogIndex, }; use curp_test_utils::{ @@ -132,6 +135,8 @@ impl CurpGroup { curp_storage, task_manager, None, + vec![Box::::default()], + vec![Box::::default()], ) }) .build();