From d7340e7b8d6abecd749ee4a2c5bb25bb0158030e Mon Sep 17 00:00:00 2001
From: geoffatmsl <geoffrey@moonsonglabs.com>
Date: Fri, 4 Oct 2024 21:31:02 +0300
Subject: [PATCH] Revert "fix: handle contract commitments for contract without
 data items (#388)" (#394)

This reverts commit 0c13f1c620f9218400488febce89d60fb933efd0.
---
 crates/bin/prove_block/src/reexecute.rs | 28 +++++++++++--------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/crates/bin/prove_block/src/reexecute.rs b/crates/bin/prove_block/src/reexecute.rs
index 6edc85b5..133b1e61 100644
--- a/crates/bin/prove_block/src/reexecute.rs
+++ b/crates/bin/prove_block/src/reexecute.rs
@@ -146,26 +146,22 @@ pub(crate) fn format_commitment_facts<H: HashFunctionType>(
 
 impl PerContractStorage for ProverPerContractStorage {
     async fn compute_commitment(&mut self) -> Result<CommitmentInfo, CommitmentInfoError> {
-        let (updated_root, commitment_facts) = match self.storage_proof.contract_data.as_ref() {
-            Some(contract_data) => {
-                let updated_root = contract_data.root;
-                let commitment_facts = format_commitment_facts::<PedersenHash>(&contract_data.storage_proofs);
-
-                let previous_commitment_facts = match &self.previous_storage_proof.contract_data {
-                    None => HashMap::default(),
-                    Some(previous_contract_data) => {
-                        format_commitment_facts::<PedersenHash>(&previous_contract_data.storage_proofs)
-                    }
-                };
+        // TODO: error code
+        let contract_data =
+            self.storage_proof.contract_data.as_ref().expect("storage proof should have a contract_data field");
+        let updated_root = contract_data.root;
+
+        let commitment_facts = format_commitment_facts::<PedersenHash>(&contract_data.storage_proofs);
 
-                let commitment_facts =
-                    commitment_facts.into_iter().chain(previous_commitment_facts.into_iter()).collect();
-                (updated_root, commitment_facts)
+        let previous_commitment_facts = match &self.previous_storage_proof.contract_data {
+            None => HashMap::default(),
+            Some(previous_contract_data) => {
+                format_commitment_facts::<PedersenHash>(&previous_contract_data.storage_proofs)
             }
-            // Defaults when no contract data is available
-            None => (Felt252::ZERO, HashMap::default()),
         };
 
+        let commitment_facts = commitment_facts.into_iter().chain(previous_commitment_facts.into_iter()).collect();
+
         Ok(CommitmentInfo {
             previous_root: self.previous_tree_root,
             updated_root,