Merge branch 'main' into tw/some-tweaks

Author: twittner

sailfish-consensus/src/lib.rs

@@ -974,7 +974,7 @@ where
                 }
                 actions.push(Action::Catchup(Round::new(r, self.committee.id())));
             }
-        } else if self.committed_round >= self.nodes.quorum() {
+        } else if self.committed_round >= *self.nodes.quorum() {
             for v in self.buffer.drain_round(r) {
                 self.dag.add(v)
             }

sailfish-types/src/nodeinfo.rs

@@ -6,7 +6,7 @@ pub struct NodeInfo<T> {
     quorum: usize,
 }
 
-impl<T: Default + PartialOrd + Clone> NodeInfo<T> {
+impl<T: Default + PartialOrd> NodeInfo<T> {
     pub fn new(c: &Committee) -> Self {
         Self {
             nodes: c.parties().map(|k| (*k, T::default())).collect(),
@@ -43,8 +43,8 @@ impl<T: Default + PartialOrd + Clone> NodeInfo<T> {
     }
 
     /// Gets the lower bound of the highest quorum interval.
-    pub fn quorum(&self) -> T {
+    pub fn quorum(&self) -> &T {
         debug_assert!(self.quorum <= self.nodes.len());
-        self.nodes[self.quorum - 1].1.clone()
+        &self.nodes[self.quorum - 1].1
     }
 }