fix: satisfy compiler warnings

catalystdao · May 3, 2024 · 3066c7a · 3066c7a
1 parent 19f8b0f
commit 3066c7a
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 24 deletions.
diff --git a/script/BaseMultiChainDeployer.s.sol b/script/BaseMultiChainDeployer.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.22;
 
 import "forge-std/Script.sol";
 

diff --git a/script/Deploy.sol b/script/Deploy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.22;
 
 import "forge-std/Script.sol";
 import {stdJson} from "forge-std/StdJson.sol";
@@ -159,7 +159,7 @@ contract DeployGeneralisedIncentives is BaseMultiChainDeployer {
     }
 
     function deployEscrow(string[] memory bridges) forEachBridge(bridges) internal {
-        address escrow = deployGeneralisedIncentives(incentiveVersion);
+        deployGeneralisedIncentives(incentiveVersion);
     }
 
     function _deploy(string[] memory bridges) internal {

diff --git a/src/apps/polymer/APolymerEscrow.sol b/src/apps/polymer/APolymerEscrow.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.22;
 
 import {IncentivizedMessageEscrow} from "../../IncentivizedMessageEscrow.sol";
 import "../../MessagePayload.sol";

diff --git a/src/apps/polymer/vIBCEscrow.sol b/src/apps/polymer/vIBCEscrow.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.22;
 
 import { APolymerEscrow } from "./APolymerEscrow.sol";
 import "../../MessagePayload.sol";

diff --git a/test/IncentivizedMessageEscrow/escrowMessage/refundGasTo.t.sol b/test/IncentivizedMessageEscrow/escrowMessage/refundGasTo.t.sol
@@ -9,7 +9,7 @@ contract EscrowInformationTest is TestCommon {
         IncentiveDescription storage incentive = _INCENTIVE;
         incentive.refundGasTo = address(0);
         vm.expectRevert();
-        (, bytes32 messageIdentifier) = escrow.submitMessage{value: _getTotalIncentive(_INCENTIVE)}(
+        escrow.submitMessage{value: _getTotalIncentive(_INCENTIVE)}(
             bytes32(uint256(0x123123) + uint256(2**255)),
             _DESTINATION_ADDRESS_THIS,
             _MESSAGE,

diff --git a/test/IncentivizedMessageEscrow/processMessage/Reentry.ack.t.sol b/test/IncentivizedMessageEscrow/processMessage/Reentry.ack.t.sol
@@ -68,7 +68,7 @@ contract AckReentryTest is TestCommon, ICrossChainReceiver {
 
     bool flag;
 
-    function receiveAck(bytes32 /* destinationIdentifier */, bytes32 /* messageIdentifier */, bytes calldata acknowledgement) external {
+    function receiveAck(bytes32 /* destinationIdentifier */, bytes32 /* messageIdentifier */, bytes calldata /* acknowledgement */) external {
         vm.expectRevert(
             abi.encodeWithSignature("MessageAlreadyAcked()")
         ); 

diff --git a/test/IncentivizedMessageEscrow/processMessage/Reentry.call.t.sol b/test/IncentivizedMessageEscrow/processMessage/Reentry.call.t.sol
@@ -83,7 +83,7 @@ contract CallReentryTest is TestCommon, ICrossChainReceiver {
     bool flag;
 
     // Receive the message and reentry.
-    function receiveMessage(bytes32 /* sourceIdentifierbytes */, bytes32 /* messageIdentifier */, bytes calldata /* fromApplication */, bytes calldata message) external returns(bytes memory acknowledgement) {
+    function receiveMessage(bytes32 /* sourceIdentifierbytes */, bytes32 /* messageIdentifier */, bytes calldata /* fromApplication */, bytes calldata /* message */) external returns(bytes memory acknowledgement) {
         vm.expectRevert(
             abi.encodeWithSignature("MessageAlreadySpent()")
         ); 

diff --git a/test/IncentivizedMessageEscrow/processMessage/RequirePaymentFromRelayer.t.sol b/test/IncentivizedMessageEscrow/processMessage/RequirePaymentFromRelayer.t.sol
@@ -63,7 +63,7 @@ contract sendPacketPaymentTest is TestCommon {
         IncentiveDescription storage incentive = _INCENTIVE;
 
         vm.recordLogs();
-        (, bytes32 messageIdentifier) = escrow.submitMessage{value: _getTotalIncentive(_INCENTIVE) + SEND_MESSAGE_PAYMENT_COST}(
+        escrow.submitMessage{value: _getTotalIncentive(_INCENTIVE) + SEND_MESSAGE_PAYMENT_COST}(
             bytes32(uint256(0x123123) + uint256(2**255)),
             _DESTINATION_ADDRESS_THIS,
             _MESSAGE,
@@ -103,7 +103,7 @@ contract sendPacketPaymentTest is TestCommon {
         IncentiveDescription storage incentive = _INCENTIVE;
 
         vm.recordLogs();
-        (, bytes32 messageIdentifier) = escrow.submitMessage{value: _getTotalIncentive(_INCENTIVE) + SEND_MESSAGE_PAYMENT_COST}(
+        escrow.submitMessage{value: _getTotalIncentive(_INCENTIVE) + SEND_MESSAGE_PAYMENT_COST}(
             bytes32(uint256(0x123123) + uint256(2**255)),
             _DESTINATION_ADDRESS_THIS,
             _MESSAGE,
@@ -132,7 +132,7 @@ contract sendPacketPaymentTest is TestCommon {
         IncentiveDescription storage incentive = _INCENTIVE;
 
         vm.recordLogs();
-        (, bytes32 messageIdentifier) = escrow.submitMessage{value: _getTotalIncentive(_INCENTIVE) + SEND_MESSAGE_PAYMENT_COST}(
+        escrow.submitMessage{value: _getTotalIncentive(_INCENTIVE) + SEND_MESSAGE_PAYMENT_COST}(
             bytes32(uint256(0x123123) + uint256(2**255)),
             _DESTINATION_ADDRESS_THIS,
             _MESSAGE,
@@ -180,7 +180,7 @@ contract sendPacketPaymentTest is TestCommon {
         vm.warp(1000000);
         IncentiveDescription storage incentive = _INCENTIVE;
 
-        (, bytes32 messageIdentifier) = escrow.submitMessage{value: _getTotalIncentive(_INCENTIVE) + SEND_MESSAGE_PAYMENT_COST}(
+        escrow.submitMessage{value: _getTotalIncentive(_INCENTIVE) + SEND_MESSAGE_PAYMENT_COST}(
             bytes32(uint256(0x123123) + uint256(2**255)),
             _DESTINATION_ADDRESS_THIS,
             _MESSAGE,

diff --git a/test/OnRecvIncentivizedMockEscrow/Timeout.t.sol b/test/OnRecvIncentivizedMockEscrow/Timeout.t.sol
diff --git a/test/wormhole/(wh)messages.t.sol b/test/wormhole/(wh)messages.t.sol
@@ -1,7 +1,7 @@
 // test/Messages.sol
 // SPDX-License-Identifier: Apache 2
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.22;
 
 import "../../src/apps/wormhole/external/wormhole/Messages.sol";
 import "../../src/apps/wormhole/external/wormhole/Setters.sol";

diff --git a/test/wormhole/roundtrip.t.sol b/test/wormhole/roundtrip.t.sol
@@ -1,7 +1,7 @@
 // test/Messages.sol
 // SPDX-License-Identifier: Apache 2
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.22;
 
 import "../../src/apps/wormhole/external/wormhole/Messages.sol";
 import "../../src/apps/wormhole/external/wormhole/Setters.sol";
@@ -100,7 +100,7 @@ contract TestRoundtrip is Test, IMessageEscrowStructs, Bytes65 {
     messages.storeGuardianSetPub(initialGuardianSet, uint32(0));
   }
 
-  function makeValidVM(bytes memory payload, uint16 emitterChainid, bytes32 emitterAddress) internal returns(bytes memory validVM) {
+  function makeValidVM(bytes memory payload, uint16 emitterChainid, bytes32 emitterAddress) view internal returns(bytes memory validVM) {
     bytes memory presigsVM = abi.encodePacked(
       uint8(1), // version
       uint32(0), // guardianSetIndex
@@ -132,7 +132,7 @@ contract TestRoundtrip is Test, IMessageEscrowStructs, Bytes65 {
     IncentiveDescription storage incentive = _INCENTIVE;
 
     vm.recordLogs();
-    (uint256 gasRefund, bytes32 messageIdentifier) = escrow.submitMessage{value: _getTotalIncentive(_INCENTIVE)}(
+    escrow.submitMessage{value: _getTotalIncentive(_INCENTIVE)}(
         _DESTINATION_IDENTIFIER,
         convertEVMTo65(address(this)),
         message,

diff --git a/test/wormhole/verifyMessage2.t.sol b/test/wormhole/verifyMessage2.t.sol
@@ -1,7 +1,7 @@
 // test/Messages.sol
 // SPDX-License-Identifier: Apache 2
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.22;
 
 import "../../src/apps/wormhole/external/wormhole/Messages.sol";
 import "../../src/apps/wormhole/external/wormhole/Setters.sol";
@@ -129,10 +129,10 @@ contract TestMessagesC2Sigs is Test {
     bytes memory invalidVM = abi.encodePacked(validVM, uint8(1));
 
     // Confirm that the test VM is valid
-    (Structs.VM memory parsedInValidVm, bool valid, string memory reason) = messages.parseAndVerifyVM(invalidVM);
+    (, bool valid, string memory reason) = messages.parseAndVerifyVM(invalidVM);
     (
-      SmallStructs.SmallVM memory smallVM,
-      bytes memory payload,
+      ,
+      ,
       bool valid2,
       string memory reason2
     ) = messages2.parseAndVerifyVM(invalidVM);

diff --git a/test/wormhole/verifyMessages.t.sol b/test/wormhole/verifyMessages.t.sol
@@ -1,7 +1,7 @@
 // test/Messages.sol
 // SPDX-License-Identifier: Apache 2
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.22;
 
 import "../../src/apps/wormhole/external/wormhole/Messages.sol";
 import "../../src/apps/wormhole/external/wormhole/Setters.sol";
@@ -105,10 +105,10 @@ contract TestMessagesC is Test {
     bytes memory invalidVM = abi.encodePacked(validVM, uint8(1));
 
     // Confirm that the test VM is valid
-    (Structs.VM memory parsedInValidVm, bool valid, string memory reason) = messages.parseAndVerifyVM(invalidVM);
+    (, bool valid, string memory reason) = messages.parseAndVerifyVM(invalidVM);
     (
-      SmallStructs.SmallVM memory smallVM,
-      bytes memory payload,
+      ,
+      ,
       bool valid2,
       string memory reason2
     ) = messages2.parseAndVerifyVM(invalidVM);