Remove Extra Computable Components

Author: agureev

contracts/src/ProtocolAdapter.sol

@@ -356,23 +356,23 @@ contract ProtocolAdapter is IProtocolAdapter, ReentrancyGuardTransient, Commitme
         bytes32 fetchedKind = IForwarder(call.untrustedForwarder).calldataCarrierResourceKind();
 
         // Check kind correspondence
-        if (resource.kind_() != fetchedKind) {
-            revert CalldataCarrierKindMismatch({expected: fetchedKind, actual: resource.kind_()});
+        if (resource.kind() != fetchedKind) {
+            revert CalldataCarrierKindMismatch({expected: fetchedKind, actual: resource.kind()});
         }
 
         // Check tag correspondence
         if (!consumed) {
             // If created, just commit the plaintext and check agains the tag
-            if (resource.commitment_() != input.tag) {
-                revert CalldataCarrierTagMismatch({actual: input.tag, expected: resource.commitment_()});
+            if (resource.commitment() != input.tag) {
+                revert CalldataCarrierTagMismatch({actual: input.tag, expected: resource.commitment()});
             }
         } else if (
             // If consumed, we expect the nullifier key to be present in the resource payload as well
-            resource.nullifier_(bytes32(input.appData.resourcePayload[1].blob)) != input.tag
+            resource.nullifier(bytes32(input.appData.resourcePayload[1].blob)) != input.tag
         ) {
             revert CalldataCarrierTagMismatch({
                 actual: input.tag,
-                expected: resource.nullifier_(abi.decode(input.appData.resourcePayload[1].blob, (bytes32)))
+                expected: resource.nullifier(abi.decode(input.appData.resourcePayload[1].blob, (bytes32)))
             });
         }
     }

contracts/src/libs/ComputableComponents.sol

@@ -11,46 +11,23 @@ library ComputableComponents {
     /// @notice Computes the resource commitment.
     /// @param resource The resource object.
     /// @return cm The computed commitment.
-    function commitment(Resource calldata resource) internal pure returns (bytes32 cm) {
+    function commitment(Resource memory resource) internal pure returns (bytes32 cm) {
         cm = sha256(abi.encode(resource));
     }
 
-    /// @notice Computes the resource commitment.
-    /// @param resource The resource object.
-    /// @return cm The computed commitment.
-    function commitment_(Resource memory resource) internal pure returns (bytes32 cm) {
-        cm = sha256(abi.encode(resource));
-    }
-
-    /// @notice Computes the resource nullifier given a nullifier key.
-    /// @param resource The resource object.
-    /// @param nullifierKey The nullifier key.
-    /// @return nf The computed nullifier.
-    /// @dev This methods does not check that the nullifier key commitment matches the nullifier key.
-    function nullifier(Resource calldata resource, bytes32 nullifierKey) internal pure returns (bytes32 nf) {
-        nf = sha256(abi.encode(resource, nullifierKey));
-    }
-
     /// @notice Computes the resource nullifier given a nullifier key.
     /// @param resource The resource object.
     /// @param nullifierKey The nullifier key.
     /// @return nf The computed nullifier.
     /// @dev This methods does not check that the nullifier key commitment matches the nullifier key.
-    function nullifier_(Resource memory resource, bytes32 nullifierKey) internal pure returns (bytes32 nf) {
+    function nullifier(Resource memory resource, bytes32 nullifierKey) internal pure returns (bytes32 nf) {
         nf = sha256(abi.encode(resource, nullifierKey));
     }
 
     /// @notice Computes the resource kind.
     /// @param resource The resource object.
     /// @return k The computed kind.
-    function kind(Resource calldata resource) internal pure returns (bytes32 k) {
-        k = sha256(abi.encode(resource.logicRef, resource.labelRef));
-    }
-
-    /// @notice Computes the resource kind.
-    /// @param resource The resource object.
-    /// @return k The computed kind.
-    function kind_(Resource memory resource) internal pure returns (bytes32 k) {
+    function kind(Resource memory resource) internal pure returns (bytes32 k) {
         k = sha256(abi.encode(resource.logicRef, resource.labelRef));
     }
 

contracts/test/examples/TxGen.sol

@@ -43,8 +43,8 @@ library TxGen {
         Resource memory consumed,
         Resource memory created
     ) internal view returns (Compliance.VerifierInput memory unit) {
-        bytes32 nf = consumed.nullifier_({nullifierKey: 0});
-        bytes32 cm = created.commitment_();
+        bytes32 nf = consumed.nullifier({nullifierKey: 0});
+        bytes32 cm = created.commitment();
 
         bytes32 unitDeltaX;
         bytes32 unitDeltaY;
@@ -81,7 +81,7 @@ library TxGen {
         Logic.AppData memory appData
     ) internal view returns (Logic.VerifierInput memory input) {
         input = Logic.VerifierInput({
-            tag: isConsumed ? resource.nullifier_({nullifierKey: 0}) : resource.commitment_(),
+            tag: isConsumed ? resource.nullifier({nullifierKey: 0}) : resource.commitment(),
             verifyingKey: resource.logicRef,
             appData: appData,
             proof: abi.encodePacked(uint32(0))
@@ -111,8 +111,8 @@ library TxGen {
         for (uint256 i = 0; i < nCUs; ++i) {
             uint256 index = (i * 2);
 
-            actionTreeTags[index] = consumed[i].resource.nullifier_({nullifierKey: 0});
-            actionTreeTags[index + 1] = created[i].resource.commitment_();
+            actionTreeTags[index] = consumed[i].resource.nullifier({nullifierKey: 0});
+            actionTreeTags[index + 1] = created[i].resource.commitment();
         }
 
         bytes32 actionTreeRoot = MerkleTree.computeRoot(actionTreeTags, 4);