From 4c187a3954cf7fa4076bba8fe39d4737110dfafe Mon Sep 17 00:00:00 2001
From: Aayush Gupta <60979345+AAYUSH-GUPTA-coder@users.noreply.github.com>
Date: Fri, 9 Jun 2023 12:33:12 +0530
Subject: [PATCH] commented validateInclusionAuxData &
 computeExpectedAuxDataWithDeal

Okay, in the current flow, these required conditions (which are giving compile time error) are in the `validateInclusionAuxData` function, which is an internal function of `computeExpectedAuxDataWithDeal`. The fun fact is that `computeExpectedAuxDataWithDeal` is commented out in the `EdgeAggregatorOracle.sol` contract. Therefore, it doesn't affect the flow. However, I do suggest either deleting or commenting out these functions in the `proof.sol` contract to remove confusion and compile-time errors.
---
 contracts/data-segment/Proof.sol | 47 +++++++++++++-------------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/contracts/data-segment/Proof.sol b/contracts/data-segment/Proof.sol
index c0fa830..4a554cf 100644
--- a/contracts/data-segment/Proof.sol
+++ b/contracts/data-segment/Proof.sol
@@ -79,40 +79,31 @@ contract Proof {
      * @param _verifierData is the verifier data
      * @return the expected aux data
      */
-    function computeExpectedAuxDataWithDeal(
-        uint64 _dealId,
-        InclusionProof memory _ip,
-        InclusionVerifierData memory _verifierData
-    ) public returns (InclusionAuxData memory) {
-        InclusionAuxData memory inclusionAuxData = computeExpectedAuxData(_ip, _verifierData);
-        validateInclusionAuxData(_dealId, inclusionAuxData);
-        return inclusionAuxData;
-    }
+    // function computeExpectedAuxDataWithDeal(
+    //     uint64 _dealId,
+    //     InclusionProof memory _ip,
+    //     InclusionVerifierData memory _verifierData
+    // ) public returns (InclusionAuxData memory) {
+    //     InclusionAuxData memory inclusionAuxData = computeExpectedAuxData(_ip, _verifierData);
+    //     validateInclusionAuxData(_dealId, inclusionAuxData);
+    //     return inclusionAuxData;
+    // }
 
     /**
      * @dev validateInclusionAuxData validates that the deal is activated and not terminated.
      * @param _dealId is the deal ID
      * @param _inclusionAuxData is the inclusion auxiliary data
      */
-    function validateInclusionAuxData(
-        uint64 _dealId,
-        InclusionAuxData memory _inclusionAuxData
-    ) internal {
-        // check that the deal is not terminated
-        MarketTypes.GetDealActivationReturn memory dealActivation = MarketAPI.getDealActivation(
-            _dealId
-        );
-        require(dealActivation.terminated <= 0, "Deal is terminated");
-        require(dealActivation.activated > 0, "Deal is not activated");
-
-        MarketTypes.GetDealDataCommitmentReturn memory dealDataCommitment = MarketAPI
-            .getDealDataCommitment(_dealId);
-        require(
-            keccak256(dealDataCommitment.data) == keccak256(_inclusionAuxData.commPa),
-            "Deal commD doesn't match"
-        );
-        require(dealDataCommitment.size == _inclusionAuxData.sizePa, "Deal size doesn't match");
-    }
+    // function validateInclusionAuxData(uint64 _dealId, InclusionAuxData memory _inclusionAuxData) internal {
+    //     // check that the deal is not terminated
+    //     MarketTypes.GetDealActivationReturn memory dealActivation = MarketAPI.getDealActivation(_dealId);
+    //     require(dealActivation.terminated <= 0, "Deal is terminated");
+    //     require(dealActivation.activated > 0, "Deal is not activated");
+
+    //     MarketTypes.GetDealDataCommitmentReturn memory dealDataCommitment = MarketAPI.getDealDataCommitment(_dealId);
+    //     require(keccak256(dealDataCommitment.data) == keccak256(_inclusionAuxData.commPa), "Deal commD doesn't match");
+    //     require(dealDataCommitment.size == _inclusionAuxData.sizePa, "Deal size doesn't match");
+    // }
 
     /**
      * @dev validateIndexEntry validates that the index entry is in the correct position in the index.