CI fixes

node/Cargo.toml

@@ -54,7 +54,7 @@ clap = { version = "4.3.3", features = ["derive"] }
 criterion = "0.5.1"
 ed25519-dalek = { version = "2.0.0", features = ["rand_core"] }
 ff_ce = "0.14.3"
-heck = "0.4.1"
+heck = "0.5.0"
 hex = "0.4.3"
 im = "15.1.0"
 once_cell = "1.17.1"

node/actors/bft/src/leader/replica_commit.rs

@@ -37,7 +37,7 @@ pub(crate) enum Error {
     NotLeaderInView,
     /// Invalid message.
     #[error("invalid message: {0:#}")]
-    InvalidMessage(anyhow::Error),
+    InvalidMessage(#[source] anyhow::Error),
     /// Duplicate message from a replica.
     #[error("duplicate message from a replica (existing message: {existing_message:?}")]
     DuplicateMessage {
@@ -46,7 +46,7 @@ pub(crate) enum Error {
     },
     /// Invalid message signature.
     #[error("invalid signature: {0:#}")]
-    InvalidSignature(#[source] validator::Error),
+    InvalidSignature(#[source] anyhow::Error),
 }
 
 impl StateMachine {

node/actors/bft/src/leader/replica_prepare.rs

@@ -40,7 +40,7 @@ pub(crate) enum Error {
     },
     /// Invalid message signature.
     #[error("invalid signature: {0:#}")]
-    InvalidSignature(#[source] validator::Error),
+    InvalidSignature(#[source] anyhow::Error),
     /// Invalid message.
     #[error(transparent)]
     InvalidMessage(validator::ReplicaPrepareVerifyError),

node/actors/bft/src/replica/leader_commit.rs

@@ -33,7 +33,7 @@ pub(crate) enum Error {
     },
     /// Invalid message signature.
     #[error("invalid signature: {0:#}")]
-    InvalidSignature(validator::Error),
+    InvalidSignature(#[source] anyhow::Error),
     /// Invalid message.
     #[error("invalid message: {0:#}")]
     InvalidMessage(validator::CommitQCVerifyError),

node/actors/bft/src/replica/leader_prepare.rs

@@ -38,7 +38,7 @@ pub(crate) enum Error {
     },
     /// Invalid message signature.
     #[error("invalid signature: {0:#}")]
-    InvalidSignature(#[source] validator::Error),
+    InvalidSignature(#[source] anyhow::Error),
     /// Invalid message.
     #[error("invalid message: {0:#}")]
     InvalidMessage(#[source] validator::LeaderPrepareVerifyError),

node/actors/network/src/consensus/handshake/mod.rs

@@ -50,7 +50,7 @@ pub(super) enum Error {
     #[error("unexpected peer")]
     PeerMismatch,
     #[error("validator signature {0}")]
-    Signature(#[from] validator::Error),
+    Signature(#[from] anyhow::Error),
     #[error("stream {0}")]
     Stream(#[source] anyhow::Error),
 }

node/actors/sync_blocks/src/peers/events.rs

@@ -4,7 +4,7 @@ use zksync_consensus_roles::{node, validator::BlockNumber};
 
 /// Events emitted by `PeerStates` actor. Only used for tests so far.
 #[derive(Debug)]
-#[allow(dead_code, unused_tuple_struct_fields)] // Variant fields are only read in tests
+#[allow(dead_code)] // Variant fields are only read in tests
 pub(super) enum PeerStateEvent {
     /// Node has successfully downloaded the specified block.
     GotBlock(BlockNumber),

node/deny.toml

@@ -59,6 +59,7 @@ multiple-versions = "deny"
 skip = [
     # Old versions required by tempfile and prost-build.
     { name = "bitflags", version = "1.3.2" },
+    { name = "heck", version = "0.4.1" },
 
     # Old version required by tracing-subscriber.
     { name = "regex-automata", version = "0.1.10" },

node/libs/concurrency/src/testonly.rs

@@ -37,7 +37,7 @@ pub fn abort_on_panic() {
 
 /// Guard which has to be dropped before timeout is reached.
 /// Otherwise the test will panic.
-#[allow(unused_tuple_struct_fields)]
+#[allow(dead_code)]
 #[must_use]
 pub struct TimeoutGuard(std::sync::mpsc::Sender<()>);
 

node/libs/roles/src/validator/keys/aggregate_signature.rs

@@ -1,4 +1,4 @@
-use super::{Error, PublicKey, Signature};
+use super::{PublicKey, Signature};
 use crate::validator::messages::{Msg, MsgHash};
 use std::fmt;
 use zksync_consensus_crypto::{bn254, ByteFmt, Text, TextFmt};
@@ -18,7 +18,7 @@ impl AggregateSignature {
     pub(crate) fn verify_messages<'a, V: Variant<Msg>>(
         &self,
         messages_and_keys: impl Iterator<Item = (V, &'a PublicKey)>,
-    ) -> Result<(), Error> {
+    ) -> anyhow::Result<()> {
         let hashes_and_keys =
             messages_and_keys.map(|(message, key)| (message.insert().hash(), key));
         self.verify_hash(hashes_and_keys)
@@ -28,7 +28,7 @@ impl AggregateSignature {
     pub(crate) fn verify_hash<'a>(
         &self,
         hashes_and_keys: impl Iterator<Item = (MsgHash, &'a PublicKey)>,
-    ) -> Result<(), Error> {
+    ) -> anyhow::Result<()> {
         let bytes_and_pks: Vec<_> = hashes_and_keys
             .map(|(hash, pk)| (hash.0.as_bytes().to_owned(), &pk.0))
             .collect();

node/libs/roles/src/validator/keys/mod.rs

@@ -9,6 +9,3 @@ pub use aggregate_signature::AggregateSignature;
 pub use public_key::PublicKey;
 pub use secret_key::SecretKey;
 pub use signature::Signature;
-
-/// Error type returned by validator key operations.
-pub type Error = zksync_consensus_crypto::bn254::Error;

node/libs/roles/src/validator/keys/signature.rs

@@ -1,4 +1,4 @@
-use super::{Error, PublicKey};
+use super::PublicKey;
 use crate::validator::messages::{Msg, MsgHash};
 use std::fmt;
 use zksync_consensus_crypto::{bn254, ByteFmt, Text, TextFmt};
@@ -9,12 +9,12 @@ pub struct Signature(pub(crate) bn254::Signature);
 
 impl Signature {
     /// Verify a message against a public key.
-    pub fn verify_msg(&self, msg: &Msg, pk: &PublicKey) -> Result<(), Error> {
+    pub fn verify_msg(&self, msg: &Msg, pk: &PublicKey) -> anyhow::Result<()> {
         self.verify_hash(&msg.hash(), pk)
     }
 
     /// Verify a message hash against a public key.
-    pub fn verify_hash(&self, msg_hash: &MsgHash, pk: &PublicKey) -> Result<(), Error> {
+    pub fn verify_hash(&self, msg_hash: &MsgHash, pk: &PublicKey) -> anyhow::Result<()> {
         self.0.verify(&ByteFmt::encode(msg_hash), &pk.0)
     }
 }

node/libs/roles/src/validator/messages/leader_commit.rs

@@ -51,7 +51,7 @@ pub enum CommitQCVerifyError {
     },
     /// Bad signature.
     #[error("bad signature: {0:#}")]
-    BadSignature(#[source] validator::Error),
+    BadSignature(#[source] anyhow::Error),
 }
 
 impl CommitQC {

node/libs/roles/src/validator/messages/leader_prepare.rs

@@ -40,7 +40,7 @@ pub enum PrepareQCVerifyError {
     },
     /// Bad signature.
     #[error("bad signature: {0:#}")]
-    BadSignature(validator::Error),
+    BadSignature(#[source] anyhow::Error),
 }
 
 impl PrepareQC {

node/libs/roles/src/validator/messages/msg.rs

@@ -1,6 +1,6 @@
 //! Generic message types.
 use super::{ConsensusMsg, NetAddress};
-use crate::{node::SessionId, validator, validator::Error};
+use crate::{node::SessionId, validator};
 use std::fmt;
 use zksync_consensus_crypto::{keccak256, ByteFmt, Text, TextFmt};
 use zksync_consensus_utils::enum_util::{BadVariantError, Variant};
@@ -108,7 +108,7 @@ pub struct Signed<V: Variant<Msg>> {
 
 impl<V: Variant<Msg> + Clone> Signed<V> {
     /// Verify the signature on the message.
-    pub fn verify(&self) -> Result<(), Error> {
+    pub fn verify(&self) -> anyhow::Result<()> {
         self.sig.verify_msg(&self.msg.clone().insert(), &self.key)
     }
 }