From f5f566d0f17e212517b988e93d6a50ec88ea0fb1 Mon Sep 17 00:00:00 2001
From: Ed Zynda <ezynda3@gmail.com>
Date: Tue, 3 Sep 2024 12:58:33 +0300
Subject: [PATCH] Change witness type to be consistent with the rest of the
 codebase

---
 src/Periphery/Permit2Proxy.sol             | 12 ++++++------
 test/solidity/Periphery/Permit2Proxy.t.sol |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Periphery/Permit2Proxy.sol b/src/Periphery/Permit2Proxy.sol
index f088babd8..da12c330c 100644
--- a/src/Periphery/Permit2Proxy.sol
+++ b/src/Periphery/Permit2Proxy.sol
@@ -22,10 +22,10 @@ contract Permit2Proxy {
     mapping(address => bool) public diamondWhitelist;
 
     string public constant WITNESS_TYPE_STRING =
-        "LIFICall witness)LIFICall(address tokenReceiver,address diamondAddress,bytes32 diamondCalldataHash)TokenPermissions(address token,uint256 amount)";
+        "LiFiCall witness)LiFiCall(address tokenReceiver,address diamondAddress,bytes32 diamondCalldataHash)TokenPermissions(address token,uint256 amount)";
     bytes32 public constant WITNESS_TYPEHASH =
         keccak256(
-            "LIFICall(address tokenReceiver,address diamondAddress,bytes32 diamondCalldataHash)"
+            "LiFiCall(address tokenReceiver,address diamondAddress,bytes32 diamondCalldataHash)"
         );
     bytes32 public immutable PERMIT_WITH_WITNESS_TYPEHASH;
 
@@ -33,7 +33,7 @@ contract Permit2Proxy {
 
     // @dev LIFI Specific Witness which verifies the correct calldata and
     //      diamond address
-    struct LIFICall {
+    struct LiFiCall {
         address diamondAddress;
         bytes32 diamondCalldataHash;
     }
@@ -151,7 +151,7 @@ contract Permit2Proxy {
         ISignatureTransfer.PermitTransferFrom calldata _permit,
         bytes calldata _signature
     ) external payable {
-        LIFICall memory lifiCall = LIFICall(
+        LiFiCall memory lifiCall = LiFiCall(
             LIFI_DIAMOND,
             keccak256(_diamondCalldata)
         );
@@ -202,7 +202,7 @@ contract Permit2Proxy {
         bytes32 permit = _getTokenPermissionsHash(tokenPermissions);
 
         // Witness
-        Permit2Proxy.LIFICall memory lifiCall = LIFICall(
+        Permit2Proxy.LiFiCall memory lifiCall = LiFiCall(
             LIFI_DIAMOND,
             keccak256(_diamondCalldata)
         );
@@ -235,7 +235,7 @@ contract Permit2Proxy {
     }
 
     function _getWitnessHash(
-        Permit2Proxy.LIFICall memory lifiCall
+        Permit2Proxy.LiFiCall memory lifiCall
     ) internal pure returns (bytes32) {
         return keccak256(abi.encode(WITNESS_TYPEHASH, lifiCall));
     }
diff --git a/test/solidity/Periphery/Permit2Proxy.t.sol b/test/solidity/Periphery/Permit2Proxy.t.sol
index 5b5df609b..8647c5dbc 100644
--- a/test/solidity/Periphery/Permit2Proxy.t.sol
+++ b/test/solidity/Periphery/Permit2Proxy.t.sol
@@ -480,7 +480,7 @@ contract Permit2ProxyTest is TestBase {
 
         // Witness
         diamondCalldata = _getCalldataForBridging();
-        Permit2Proxy.LIFICall memory lifiCall = Permit2Proxy.LIFICall(
+        Permit2Proxy.LiFiCall memory lifiCall = Permit2Proxy.LiFiCall(
             DIAMOND_ADDRESS,
             keccak256(diamondCalldata)
         );
@@ -542,7 +542,7 @@ contract Permit2ProxyTest is TestBase {
     }
 
     function _getWitnessHash(
-        Permit2Proxy.LIFICall memory lifiCall
+        Permit2Proxy.LiFiCall memory lifiCall
     ) internal view returns (bytes32) {
         return
             keccak256(abi.encode(permit2Proxy.WITNESS_TYPEHASH(), lifiCall));