diff --git a/crates/radicle-node/src/test.rs b/crates/radicle-node/src/test.rs index f8f0d403d..4ce2b7fb8 100644 --- a/crates/radicle-node/src/test.rs +++ b/crates/radicle-node/src/test.rs @@ -1,7 +1,10 @@ -pub mod gossip; -pub mod handle; +#[cfg(test)] +pub(crate) mod gossip; +#[cfg(test)] +pub(crate) mod handle; +#[cfg(any(test, feature = "test"))] pub mod node; -pub mod peer; -pub mod simulator; - -use radicle::test::*; +#[cfg(test)] +pub(crate) mod peer; +#[cfg(test)] +pub(crate) mod simulator; diff --git a/crates/radicle-node/src/test/gossip.rs b/crates/radicle-node/src/test/gossip.rs index 653fe4972..76bd5058e 100644 --- a/crates/radicle-node/src/test/gossip.rs +++ b/crates/radicle-node/src/test/gossip.rs @@ -7,8 +7,6 @@ use radicle::node::UserAgent; use radicle::test::arbitrary; use radicle::test::fixtures::r#gen; -use crate::test::arbitrary; - pub fn messages(count: usize, now: LocalTime, delta: LocalDuration) -> Vec { let mut rng = fastrand::Rng::new(); let mut msgs = Vec::new(); diff --git a/crates/radicle-node/src/test/peer.rs b/crates/radicle-node/src/test/peer.rs index da312f961..779ad4ab0 100644 --- a/crates/radicle-node/src/test/peer.rs +++ b/crates/radicle-node/src/test/peer.rs @@ -31,11 +31,10 @@ use radicle::node::routing::Store as _; use radicle::node::{Address, Event, NodeId, Timestamp}; use radicle::node::{Alias, ConnectOptions, address}; use radicle::rad; -use radicle::storage::git::transport::remote; +use radicle::storage::WriteStorage; use radicle::storage::refs; use radicle::storage::refs::{RefsAt, SignedRefs}; use radicle::storage::{ReadRepository, RemoteRepository}; -use radicle::storage::{RemoteId, WriteStorage}; use radicle::test::storage::MockStorage; use radicle::test::{arbitrary, fixtures}; @@ -278,14 +277,6 @@ where .unwrap() } - pub fn git_url(&self, repo: RepoId, namespace: Option) -> remote::Url { - remote::Url { - node: *self.nid(), - repo, - namespace, - } - } - pub fn receive(&mut self, peer: NodeId, msg: Message) -> &mut Self { self.service.received_message(peer, msg); self diff --git a/crates/radicle-node/src/test/simulator.rs b/crates/radicle-node/src/test/simulator.rs index 071de7afc..9cf72594a 100644 --- a/crates/radicle-node/src/test/simulator.rs +++ b/crates/radicle-node/src/test/simulator.rs @@ -22,15 +22,12 @@ use radicle::node::NodeId; use radicle::node::events::Event; use radicle::storage::Namespaces; use radicle::storage::{ReadRepository, WriteStorage}; - -use crate::test::arbitrary; +use radicle::test::arbitrary; use super::peer::Peer; /// Minimum latency between peers. pub const MIN_LATENCY: LocalDuration = LocalDuration::from_millis(1); -/// Maximum number of events buffered per peer. -pub const MAX_EVENTS: usize = 2048; /// Simulated service input. #[derive(Debug, Clone)] @@ -239,11 +236,6 @@ where .all(|(_, s)| matches!(s.input, Input::Wake)) } - /// Get a node's emitted events. - pub fn events(&mut self, node: &NodeId) -> impl Iterator + '_ { - self.events.entry(*node).or_default().drain(..) - } - /// Get all messages received by nodes during the simulation. pub fn messages(&mut self) -> &[(NodeId, NodeId, Message)] { &self.messages @@ -277,14 +269,6 @@ where } } - /// Process one scheduled input from the inbox, using the provided peers. - /// This function should be called until it returns `false`, or some desired state is reached. - /// Returns `true` if there are more messages to process. - pub fn step<'a>(&mut self, peers: impl IntoIterator>) -> bool { - let mut nodes: BTreeMap<_, _> = peers.into_iter().map(|p| (*p.nid(), p)).collect(); - self.step_(&mut nodes) - } - fn step_(&mut self, nodes: &mut BTreeMap>) -> bool { if !self.opts.latency.is_empty() { // Configure latencies.