From 67ef2dc2d21d480f5d5ca05f797f5a6a9e57e69a Mon Sep 17 00:00:00 2001 From: Daniel Sanchez Quiros Date: Thu, 7 Nov 2024 11:51:58 +0700 Subject: [PATCH] Rebase changes --- simlib/mixnet-sims/src/node/mix/mod.rs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/simlib/mixnet-sims/src/node/mix/mod.rs b/simlib/mixnet-sims/src/node/mix/mod.rs index eaeeda8..241d3e5 100644 --- a/simlib/mixnet-sims/src/node/mix/mod.rs +++ b/simlib/mixnet-sims/src/node/mix/mod.rs @@ -1,20 +1,18 @@ -pub mod scheduler; -pub mod lottery; pub mod consensus_streams; +pub mod lottery; +pub mod scheduler; pub mod state; pub mod stream_wrapper; -use super::{Node, NodeId}; -use crate::{ - network::{InMemoryNetworkInterface, NetworkInterface, PayloadSize}, - warding::WardCondition, -}; use crossbeam::channel; use futures::Stream; use lottery::StakeLottery; use multiaddr::Multiaddr; -use netrunner::network::{InMemoryNetworkInterface, NetworkInterface, PayloadSize}; use netrunner::node::{Node, NodeId}; +use netrunner::{ + network::{InMemoryNetworkInterface, NetworkInterface, PayloadSize}, + warding::WardCondition, +}; use nomos_mix::{ membership::Membership, message_blend::{ @@ -26,7 +24,7 @@ use nomos_mix::{ MixOutgoingMessage, }; use nomos_mix_message::mock::MockMixMessage; -use rand::{Rng, RngCore, SeedableRng}; +use rand::SeedableRng; use rand_chacha::ChaCha12Rng; use scheduler::{Interval, TemporalRelease}; use serde::Deserialize;