refactor

Author: Mr-Leshiy

rust/catalyst-voting/src/crypto/zk_unit_vector/decoding.rs

@@ -27,22 +27,34 @@ impl UnitVectorProof {
         let ann = (0..len)
             .map(|i| {
                 let bytes = read_array(reader)?;
-                Announcement::from_bytes(&bytes)
-                    .map_err(|e| anyhow!("Cannot decode announcement at {i}, error: {e}."))
+                Announcement::from_bytes(&bytes).map_err(|e| {
+                    anyhow!(
+                        "Cannot decode announcement at {i}, \
+                        error: {e}."
+                    )
+                })
             })
             .collect::<anyhow::Result<_>>()?;
         let dl = (0..len)
             .map(|i| {
                 let bytes = read_array(reader)?;
-                Ciphertext::from_bytes(&bytes)
-                    .map_err(|e| anyhow!("Cannot decode ciphertext at {i}, error: {e}."))
+                Ciphertext::from_bytes(&bytes).map_err(|e| {
+                    anyhow!(
+                        "Cannot decode ciphertext at {i}, \
+                        error: {e}."
+                    )
+                })
             })
             .collect::<anyhow::Result<_>>()?;
         let rr = (0..len)
             .map(|i| {
                 let bytes = read_array(reader)?;
-                ResponseRandomness::from_bytes(&bytes)
-                    .map_err(|e| anyhow!("Cannot decode response randomness at {i}, error: {e}."))
+                ResponseRandomness::from_bytes(&bytes).map_err(|e| {
+                    anyhow!(
+                        "Cannot decode response randomness at {i}, \
+                        error: {e}."
+                    )
+                })
             })
             .collect::<anyhow::Result<_>>()?;
 

rust/catalyst-voting/src/txs/v1/decoding.rs

@@ -112,14 +112,16 @@ impl Tx {
         let padding_tag = read_be_u8(reader).map_err(|_| anyhow!("Missing padding tag field."))?;
         ensure!(
             padding_tag == PADDING_TAG,
-            "Invalid padding tag field value, must be equals to {PADDING_TAG}, provided: {padding_tag}.",
+            "Invalid padding tag field value, must be equals to {PADDING_TAG}, \
+            provided: {padding_tag}.",
         );
 
         let fragment_tag =
             read_be_u8(reader).map_err(|_| anyhow!("Missing fragment tag field."))?;
         ensure!(
             fragment_tag == FRAGMENT_TAG,
-            "Invalid fragment tag field value, must be equals to {FRAGMENT_TAG}, provided: {fragment_tag}.",
+            "Invalid fragment tag field value, must be equals to {FRAGMENT_TAG}, \
+            provided: {fragment_tag}.",
         );
 
         let vote_plan_id =
@@ -148,7 +150,8 @@ impl Tx {
             },
             tag => {
                 bail!(
-                    "Invalid vote tag value, must be equals to {PUBLIC_VOTE_TAG} or {PRIVATE_VOTE_TAG}, provided: {tag}"
+                    "Invalid vote tag value, \
+                    must be equals to {PUBLIC_VOTE_TAG} or {PRIVATE_VOTE_TAG}, provided: {tag}"
                 )
             },
         };
@@ -160,20 +163,23 @@ impl Tx {
             read_be_u8(reader).map_err(|_| anyhow!("Missing inputs amount field."))?;
         ensure!(
             inputs_amount == NUMBER_OF_INPUTS,
-            "Invalid number of inputs, expected: {NUMBER_OF_INPUTS}, provided: {inputs_amount}",
+            "Invalid number of inputs, expected: {NUMBER_OF_INPUTS}, \
+            provided: {inputs_amount}",
         );
 
         let outputs_amount =
             read_be_u8(reader).map_err(|_| anyhow!("Missing outputs amount field."))?;
         ensure!(
             outputs_amount == NUMBER_OF_OUTPUTS,
-            "Invalid number of outputs, expected: {NUMBER_OF_OUTPUTS}, provided: {outputs_amount}",
+            "Invalid number of outputs, expected: {NUMBER_OF_OUTPUTS}, \
+            provided: {outputs_amount}",
         );
 
         let input_tag = read_be_u8(reader).map_err(|_| anyhow!("Missing input tag field."))?;
         ensure!(
             input_tag == INPUT_TAG,
-            "Invalid input tag, expected: {INPUT_TAG}, provided: {input_tag}",
+            "Invalid input tag, expected: {INPUT_TAG}, \
+            provided: {input_tag}",
         );
 
         // skip value
@@ -187,7 +193,8 @@ impl Tx {
         let witness_tag = read_be_u8(reader).map_err(|_| anyhow!("Missing witness tag field."))?;
         ensure!(
             witness_tag == WITNESS_TAG,
-            "Invalid witness tag, expected: {WITNESS_TAG}, provided: {witness_tag}",
+            "Invalid witness tag, expected: {WITNESS_TAG}, \
+            provided: {witness_tag}",
         );
 
         // Skip nonce field

rust/catalyst-voting/src/vote_protocol/tally/mod.rs

@@ -58,18 +58,22 @@ pub fn tally(
 ) -> anyhow::Result<EncryptedTally> {
     ensure!(
         votes.len() == voting_powers.len(),
-        "Votes and voting power length mismatch. Votes amount: {0}. Voting powers amount: {1}.",
+        "Votes and voting power length mismatch. Votes amount: {0}. \
+        Voting powers amount: {1}.",
         votes.len(),
         voting_powers.len(),
     );
 
-    let mut ciphertexts_per_voting_option = Vec::new();
-    for (i, vote) in votes.iter().enumerate() {
-        let ciphertext = vote
-            .get_ciphertext_for_choice(voting_option)
-            .ok_or(anyhow!("Invalid encrypted vote at index {i}. Does not have a ciphertext for the voting option {voting_option}.") )?;
-        ciphertexts_per_voting_option.push(ciphertext);
-    }
+    let ciphertexts_per_voting_option = votes
+        .iter()
+        .enumerate()
+        .map(|(i, v)| {
+            v.get_ciphertext_for_choice(voting_option).ok_or(anyhow!(
+                "Invalid encrypted vote at index {i}. \
+                Does not have a ciphertext for the voting option {voting_option}."
+            ))
+        })
+        .collect::<anyhow::Result<Vec<_>>>()?;
 
     let zero_ciphertext = Ciphertext::zero();
 
@@ -97,9 +101,21 @@ pub fn decrypt_tally(
 ) -> anyhow::Result<u64> {
     let ge = decrypt(&tally_result.0, &secret_key.0);
 
-    let res = setup
-        .discrete_log_setup
-        .discrete_log(ge)
-        .map_err(|_| anyhow!("Cannot decrypt tally result. Provided an invalid secret key or invalid encrypted tally result."))?;
+    let res = setup.discrete_log_setup.discrete_log(ge).map_err(|_| {
+        anyhow!(
+            "Cannot decrypt tally result. \
+            Provided an invalid secret key or invalid encrypted tally result."
+        )
+    })?;
     Ok(res)
 }
+
+#[test]
+fn test() {
+    let i = 10;
+    let voting_option = 1;
+    println!(
+        "Invalid encrypted vote at index {i}. \
+        Does not have a ciphertext for the voting option {voting_option}."
+    );
+}