Merge branch 'main' into A0-4568-replyguy

.github/workflows/publish-packages.yml

@@ -4,17 +4,30 @@ on:
   push:
     branches:
       - main
+  pull_request:
 
 jobs:
   publish:
     environment: Autobump version
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'Cardinal-Cryptography/AlephBFT'}}
     steps:
+      - name: Publish
+        if: ${{ github.event_name == 'push' }}
+        run:
+          echo "Publishing crates."
+
+      - name: Dry-ryn
+        if: ${{ github.event_name != 'push' }}
+        run:
+          echo "Dry-run - not publishing crates."
+
       - uses: actions/checkout@v4
+
       - uses: ./.github/actions/install-rust-toolchain
+
       - uses: katyo/publish-crates@v2
         with:
           registry-token: ${{ secrets.CRATES_IO_TOKEN }}
-          ignore-unpublished-changes: true
           publish-delay: 30000
+          dry-run: ${{ github.event_name != 'push' }}

consensus/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aleph-bft"
-version = "0.38.1"
+version = "0.38.2"
 edition = "2021"
 authors = ["Cardinal Cryptography"]
 categories = ["algorithms", "data-structures", "cryptography", "database"]

consensus/src/extension/election.rs

@@ -94,7 +94,7 @@ impl<U: UnitWithParents> CandidateElection<U> {
 
     fn vote(&mut self, voter: &U) -> Result<(), CandidateOutcome<U::Hasher>> {
         // If the vote is already computed we are done.
-        if self.votes.get(&voter.hash()).is_some() {
+        if self.votes.contains_key(&voter.hash()) {
             return Ok(());
         }
         // Votes for old units are never used, so we just return.

consensus/src/testing/mod.rs

@@ -1,4 +1,3 @@
-#![cfg(test)]
 mod alerts;
 mod byzantine;
 mod crash;

examples/ordering/src/main.rs

@@ -9,8 +9,7 @@ use dataio::{Data, DataProvider, FinalizationHandler};
 use futures::{channel::oneshot, io, StreamExt};
 use log::{debug, error, info};
 use network::Network;
-use std::sync::Arc;
-use std::{path::Path, time::Duration};
+use std::{path::Path, sync::Arc, time::Duration};
 use time::{macros::format_description, OffsetDateTime};
 use tokio::fs::{self, File};
 use tokio_util::compat::{Compat, TokioAsyncWriteCompatExt};

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.77.0"
+channel = "1.79.0"