chore: apply rabbit feedback

dashpay · Oct 4, 2024 · 350bbf8 · 350bbf8
1 parent f79d240
commit 350bbf8
Showing 1 changed file with 10 additions and 17 deletions.
diff --git a/packages/rs-drive-proof-verifier/src/proof.rs b/packages/rs-drive-proof-verifier/src/proof.rs
@@ -832,24 +832,17 @@ impl FromProof<platform::GetDataContractsRequest> for DataContracts {
         })?;
 
         verify_tenderdash_proof(proof, mtd, &root_hash, provider)?;
-
-        let maybe_contracts: Option<DataContracts> = if !contracts.is_empty() {
-            let contracts: DataContracts = contracts
-                .into_iter()
-                .try_fold(DataContracts::new(), |mut acc, (k, v)| {
-                    Identifier::from_bytes(&k).map(|id| {
-                        acc.insert(id, v);
-                        acc
-                    })
+        let maybe_contracts = contracts
+            .into_iter()
+            .map(|(k, v)| {
+                Identifier::from_bytes(&k).map(|id| (id, v)).map_err(|e| {
+                    Error::ResultEncodingError {
+                        error: e.to_string(),
+                    }
                 })
-                .map_err(|e| Error::ResultEncodingError {
-                    error: e.to_string(),
-                })?;
-
-            Some(contracts)
-        } else {
-            None
-        };
+            })
+            .collect::<Result<DataContracts, Error>>()?
+            .into_option();
 
         Ok((maybe_contracts, mtd.clone(), proof.clone()))
     }