Fixing errors related to empty contributions on the beginning of the …

…round.
nimiq · Mar 26, 2024 · ae9c221 · ae9c221
1 parent 643d7e0
commit ae9c221
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/src/bin/monitor.rs b/src/bin/monitor.rs
@@ -103,7 +103,7 @@ impl RoundState {
                     )
                     .await;
 
-                return Err(MonitorError::ParametersDifferentBetweenRounds(
+                return Err(MonitorError::MonitorParametersDifferentBetweenRounds(
                     self.setups_contribution_state.len(),
                     ceremony.setups.len(),
                 )
@@ -188,8 +188,7 @@ impl RoundState {
                         pending_verification_timeout,
                         contribution_timeout,
                     )
-                    .await
-                    .unwrap();
+                    .await?;
 
                 if setup_finished.load(Ordering::Relaxed) {
                     let verified_participant_ids_in_chunk: HashSet<_> = new_chunk

diff --git a/src/error.rs b/src/error.rs
@@ -55,7 +55,7 @@ pub enum MonitorError {
     #[error("Lock holder was none")]
     LockHolderIsNoneError,
     #[error("Parameters were different between rounds: expected. Setups: {0:?}, got {1:?}")]
-    ParametersDifferentBetweenRounds(usize, usize),
+    MonitorParametersDifferentBetweenRounds(usize, usize),
 }
 
 #[derive(Debug, Error)]

diff --git a/src/monitor_setup_state.rs b/src/monitor_setup_state.rs
@@ -24,15 +24,19 @@ impl TryFrom<&Contribution> for ChunkState {
     type Error = anyhow::Error;
 
     fn try_from(contribution: &Contribution) -> Result<Self> {
-        Ok(Self::RecordedState {
-            last_contributor: contribution.contributor_id()?,
-            metadata: contribution
-                .metadata
-                .clone()
-                .ok_or(VerifyTranscriptError::ContributorDataIsNoneError)?,
-            verifying_timeout: false,
-            contributing_timeout: false,
-        })
+        if let Result::Ok(contributor_id) = contribution.contributor_id() {
+            Ok(Self::RecordedState {
+                last_contributor: contributor_id,
+                metadata: contribution
+                    .metadata
+                    .clone()
+                    .ok_or(VerifyTranscriptError::ContributorDataIsNoneError)?,
+                verifying_timeout: false,
+                contributing_timeout: false,
+            })
+        } else {
+            Ok(Self::EmptyState())
+        }
     }
 }