Make errors more informative

nimiq · Nov 28, 2024 · 8b9e5c8 · 8b9e5c8
1 parent f151505
commit 8b9e5c8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/zkp-component/src/proof_utils.rs b/zkp-component/src/proof_utils.rs
@@ -48,10 +48,10 @@ pub(crate) fn get_proof_macro_blocks(
         let new_block = blockchain
             .read()
             .get_block_at(block_number, true)
-            .map_err(|_| Error::InvalidBlock)?;
+            .map_err(|_| Error::UnknownBlock(block_number))?;
 
         if !new_block.is_election() {
-            return Err(Error::InvalidBlock);
+            return Err(Error::NotElectionBlock);
         }
         new_block.unwrap_macro()
     };

diff --git a/zkp-component/src/types.rs b/zkp-component/src/types.rs
@@ -152,8 +152,14 @@ pub enum Error {
     #[error("Nano Zkp Error: {0}")]
     NanoZKP(#[from] NanoZKPError),
 
-    #[error("Proof's blocks are not valid")]
-    InvalidBlock,
+    #[error("Proof's blocks is not an election block")]
+    NotElectionBlock,
+
+    #[error("Proof's block is not known: {0}")]
+    UnknownBlock(u32),
+
+    #[error("Response was invalid: requested_block: {0}")]
+    InvalidResponse(bool),
 
     #[error("Outdated proof")]
     OutdatedProof,

diff --git a/zkp-component/src/zkp_requests.rs b/zkp-component/src/zkp_requests.rs
@@ -119,18 +119,18 @@ impl<N: Network + 'static> Stream for ZKPRequests<N> {
         while let Poll::Ready(result) = self.zkp_request_results.poll_next_unpin(cx) {
             match result {
                 Some((peer_id, request_election_block, response_channel, result)) => match result {
-                    Ok(RequestZKPResponse::Proof(proof, mut election_block)) => {
+                    Ok(RequestZKPResponse::Proof(proof, election_block)) => {
                         // Check that the response is in-line with whether we asked for the election block or not.
-                        if request_election_block {
-                            if election_block.is_none() {
-                                if let Some(tx) = response_channel {
-                                    let _ = tx.send(Err(Error::InvalidBlock));
-                                }
-                                continue;
+                        if (request_election_block && election_block.is_none())
+                            || (!request_election_block && !election_block.is_none())
+                        {
+                            if let Some(tx) = response_channel {
+                                let _ =
+                                    tx.send(Err(Error::InvalidResponse(request_election_block)));
                             }
-                        } else {
-                            election_block = None;
+                            continue;
                         }
+
                         return Poll::Ready(Some(ZKPRequestsItem {
                             peer_id,
                             proof,