diff --git a/crates/hotshot/src/traits/election/static_committee.rs b/crates/hotshot/src/traits/election/static_committee.rs index e423294d81..d2b62f80b7 100644 --- a/crates/hotshot/src/traits/election/static_committee.rs +++ b/crates/hotshot/src/traits/election/static_committee.rs @@ -15,10 +15,9 @@ use hotshot_types::{ PeerConfig, }; use primitive_types::U256; -use serde::{Deserialize, Serialize}; use utils::anytrace::Result; -#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize, Deserialize)] +#[derive(Clone, Debug, Eq, PartialEq, Hash)] /// The static committee election pub struct StaticCommittee { /// The nodes eligible for leadership. diff --git a/crates/hotshot/src/traits/election/static_committee_leader_two_views.rs b/crates/hotshot/src/traits/election/static_committee_leader_two_views.rs index eda8c4a263..cd0b826694 100644 --- a/crates/hotshot/src/traits/election/static_committee_leader_two_views.rs +++ b/crates/hotshot/src/traits/election/static_committee_leader_two_views.rs @@ -15,11 +15,9 @@ use hotshot_types::{ PeerConfig, }; use primitive_types::U256; -use serde::{Deserialize, Serialize}; use utils::anytrace::Result; -#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize, Deserialize)] - +#[derive(Clone, Debug, Eq, PartialEq, Hash)] /// The static committee election pub struct StaticCommitteeLeaderForTwoViews { /// The nodes eligible for leadership. diff --git a/crates/task-impls/src/quorum_proposal/mod.rs b/crates/task-impls/src/quorum_proposal/mod.rs index 6c1cc5561a..0ba16ed46f 100644 --- a/crates/task-impls/src/quorum_proposal/mod.rs +++ b/crates/task-impls/src/quorum_proposal/mod.rs @@ -98,7 +98,6 @@ impl, V: Versions> view_number: TYPES::View, event_receiver: Receiver>>, ) -> EventDependency>> { - let id = self.id; EventDependency::new( event_receiver, Box::new(move |event| { @@ -160,7 +159,7 @@ impl, V: Versions> let valid = event_view == view_number; if valid { tracing::debug!( - "Dependency {dependency_type:?} is complete for view {event_view:?}, my id is {id:?}!", + "Dependency {dependency_type:?} is complete for view {event_view:?}", ); } valid diff --git a/crates/task-impls/src/quorum_vote/mod.rs b/crates/task-impls/src/quorum_vote/mod.rs index adb8f80f4a..8cf4698d14 100644 --- a/crates/task-impls/src/quorum_vote/mod.rs +++ b/crates/task-impls/src/quorum_vote/mod.rs @@ -306,7 +306,6 @@ impl, V: Versions> QuorumVoteTaskS view_number: TYPES::View, event_receiver: Receiver>>, ) -> EventDependency>> { - let id = self.id; EventDependency::new( event_receiver.clone(), Box::new(move |event| { @@ -336,10 +335,9 @@ impl, V: Versions> QuorumVoteTaskS }; if event_view == view_number { tracing::trace!( - "Vote dependency {:?} completed for view {:?}, my id is {:?}", + "Vote dependency {:?} completed for view {:?}", dependency_type, view_number, - id, ); return true; } diff --git a/crates/testing/tests/tests_1/test_success.rs b/crates/testing/tests/tests_1/test_success.rs index f380b95f26..97244b1946 100644 --- a/crates/testing/tests/tests_1/test_success.rs +++ b/crates/testing/tests/tests_1/test_success.rs @@ -169,7 +169,6 @@ cross_tests!( epoch_height: 10, num_nodes_with_stake: 10, start_nodes: 10, - num_bootstrap_nodes: 10, da_staked_committee_size: 10, overall_safety_properties: OverallSafetyPropertiesDescription { // Explicitly show that we use normal threshold, i.e. 2 nodes_len / 3 + 1 diff --git a/crates/types/src/traits/election.rs b/crates/types/src/traits/election.rs index a01fa444f2..5b72ea4f84 100644 --- a/crates/types/src/traits/election.rs +++ b/crates/types/src/traits/election.rs @@ -7,16 +7,13 @@ //! The election trait, used to decide which node is the leader and determine if a vote is valid. use std::{collections::BTreeSet, fmt::Debug, num::NonZeroU64}; -use serde::{Deserialize, Serialize}; use utils::anytrace::Result; use super::node_implementation::NodeType; use crate::{traits::signature_key::SignatureKey, PeerConfig}; /// A protocol for determining membership in and participating in a committee. -pub trait Membership: - Clone + Debug + Send + Sync + Serialize + for<'de> Deserialize<'de> -{ +pub trait Membership: Clone + Debug + Send + Sync { /// The error type returned by methods like `lookup_leader`. type Error: std::fmt::Display;