Simplifies contract invocations in tests

wormhole-foundation · Nov 20, 2024 · e33002f · e33002f
1 parent 50862c3
commit e33002f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 47 deletions.
diff --git a/test/components/dispatcher/AccessControl.t.sol b/test/components/dispatcher/AccessControl.t.sol
@@ -29,7 +29,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.prank(owner);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         ACCESS_CONTROL_ID,
         commandCount,
         PROPOSE_OWNERSHIP_TRANSFER_ID,
@@ -40,7 +39,6 @@ contract AcessControlTest is DispatcherTestBase {
     commandCount = 2;
     bytes memory getRes = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector,
         ACCESS_CONTROL_QUERIES_ID,
         commandCount,
         OWNER_ID,
@@ -56,14 +54,12 @@ contract AcessControlTest is DispatcherTestBase {
     vm.prank(newOwner);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector, 
         ACQUIRE_OWNERSHIP_ID
       )
     );
 
     getRes = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector,
 
         ACCESS_CONTROL_QUERIES_ID,
         commandCount,
@@ -85,7 +81,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.expectRevert(NotAuthorized.selector);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         ACCESS_CONTROL_ID,
         commandCount,
         PROPOSE_OWNERSHIP_TRANSFER_ID,
@@ -101,7 +96,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.prank(owner);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         ACCESS_CONTROL_ID,
         commandCount,
         PROPOSE_OWNERSHIP_TRANSFER_ID,
@@ -112,7 +106,6 @@ contract AcessControlTest is DispatcherTestBase {
     commandCount = 2;
     bytes memory getRes = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector,
         ACCESS_CONTROL_QUERIES_ID,
         commandCount,
         OWNER_ID,
@@ -134,7 +127,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.expectRevert(NotAuthorized.selector);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector, 
         ACQUIRE_OWNERSHIP_ID
       )
     );
@@ -147,7 +139,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.prank(owner);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         ACCESS_CONTROL_ID,
         commandCount,
         PROPOSE_OWNERSHIP_TRANSFER_ID,
@@ -158,14 +149,12 @@ contract AcessControlTest is DispatcherTestBase {
     vm.prank(newOwner);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector, 
         ACQUIRE_OWNERSHIP_ID
       )
     );
 
     bytes memory getRes = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector,
 
         ACCESS_CONTROL_QUERIES_ID,
         commandCount,
@@ -194,7 +183,6 @@ contract AcessControlTest is DispatcherTestBase {
     uint8 commandCount = 2;
     bytes memory getRes = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector,
         ACCESS_CONTROL_QUERIES_ID,
         commandCount,
         OWNER_ID,
@@ -223,7 +211,6 @@ contract AcessControlTest is DispatcherTestBase {
     uint8 commandCount = 2;
     bytes memory getRes = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector,
         ACCESS_CONTROL_QUERIES_ID,
         commandCount,
         OWNER_ID,
@@ -252,7 +239,6 @@ contract AcessControlTest is DispatcherTestBase {
     uint8 commandCount = 2;
     bytes memory getRes = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector,
         ACCESS_CONTROL_QUERIES_ID,
         commandCount,
         OWNER_ID,
@@ -276,7 +262,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.prank(owner);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector, 
         ACCESS_CONTROL_ID,
         commandCount, 
         PROPOSE_OWNERSHIP_TRANSFER_ID,
@@ -287,7 +272,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.prank(newOwner);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector, 
         ACQUIRE_OWNERSHIP_ID, 
         ACCESS_CONTROL_ID,
         commandCount, 
@@ -299,7 +283,6 @@ contract AcessControlTest is DispatcherTestBase {
     commandCount = 3;
     bytes memory getRes = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector, 
         ACCESS_CONTROL_QUERIES_ID,
         commandCount, 
         OWNER_ID,
@@ -328,7 +311,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.expectRevert(NotAuthorized.selector);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         ACCESS_CONTROL_ID,
         commandCount, 
         ADD_ADMIN_ID,
@@ -340,7 +322,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.prank(admin);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         ACCESS_CONTROL_ID,
         commandCount, 
         ADD_ADMIN_ID,
@@ -356,7 +337,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.prank(owner);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         ACCESS_CONTROL_ID,
         commandCount, 
         ADD_ADMIN_ID,
@@ -367,7 +347,6 @@ contract AcessControlTest is DispatcherTestBase {
     commandCount = 2;
     bytes memory res = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector,
         ACCESS_CONTROL_QUERIES_ID,
         commandCount,
         IS_ADMIN_ID,
@@ -392,7 +371,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.expectRevert(NotAuthorized.selector);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         ACCESS_CONTROL_ID,
         commandCount, 
         REVOKE_ADMIN_ID,
@@ -408,7 +386,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.prank(owner);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         ACCESS_CONTROL_ID,
         commandCount, 
         ADD_ADMIN_ID,
@@ -420,7 +397,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.prank(admin);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         ACCESS_CONTROL_ID,
         commandCount, 
         REVOKE_ADMIN_ID,
@@ -431,7 +407,6 @@ contract AcessControlTest is DispatcherTestBase {
     commandCount = 2;
     bytes memory res = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector,
         ACCESS_CONTROL_QUERIES_ID,
         commandCount,
         IS_ADMIN_ID,
@@ -453,7 +428,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.prank(admin);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         ACCESS_CONTROL_ID,
         commandCount,
         REVOKE_ADMIN_ID,
@@ -464,7 +438,6 @@ contract AcessControlTest is DispatcherTestBase {
     bool isAdmin;
     (isAdmin, ) = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector,
         ACCESS_CONTROL_QUERIES_ID,
         commandCount,
         IS_ADMIN_ID,
@@ -481,7 +454,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.expectRevert(NotAuthorized.selector);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         ACCESS_CONTROL_ID,
         commandCount,
         RELINQUISH_OWNERSHIP_ID
@@ -498,7 +470,6 @@ contract AcessControlTest is DispatcherTestBase {
     );
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         ACCESS_CONTROL_ID,
         commandCount,
         RELINQUISH_OWNERSHIP_ID,
@@ -514,7 +485,6 @@ contract AcessControlTest is DispatcherTestBase {
     vm.prank(owner);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         ACCESS_CONTROL_ID,
         commandCount,
         RELINQUISH_OWNERSHIP_ID
@@ -523,7 +493,6 @@ contract AcessControlTest is DispatcherTestBase {
 
     (address owner_, ) = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector,
         ACCESS_CONTROL_QUERIES_ID,
         commandCount,
         OWNER_ID

diff --git a/test/components/dispatcher/SweepTokens.t.sol b/test/components/dispatcher/SweepTokens.t.sol
@@ -24,7 +24,6 @@ contract SweepTokensTest is DispatcherTestBase {
     vm.prank(owner);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector, 
         SWEEP_TOKENS_ID, address(token), tokenAmount
       )
     );
@@ -42,7 +41,6 @@ contract SweepTokensTest is DispatcherTestBase {
     vm.prank(owner);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         SWEEP_TOKENS_ID, address(0), ethAmount
       )
     );

diff --git a/test/components/dispatcher/Upgrade.t.sol b/test/components/dispatcher/Upgrade.t.sol
@@ -21,7 +21,6 @@ contract UpgradeTest is DispatcherTestBase {
     vm.expectRevert(NotAuthorized.selector);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         UPGRADE_CONTRACT_ID,
         address(fakeAddress)
       )
@@ -31,7 +30,6 @@ contract UpgradeTest is DispatcherTestBase {
     vm.expectRevert(NotAuthorized.selector);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         UPGRADE_CONTRACT_ID,
         address(fakeAddress)
       )
@@ -44,7 +42,6 @@ contract UpgradeTest is DispatcherTestBase {
     vm.startPrank(owner);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         UPGRADE_CONTRACT_ID,
         address(upgradeTester)
       )
@@ -59,7 +56,6 @@ contract UpgradeTest is DispatcherTestBase {
 
     bytes memory response = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector,
         IMPLEMENTATION_ID
       )
     );
@@ -69,7 +65,6 @@ contract UpgradeTest is DispatcherTestBase {
     vm.startPrank(owner);
     invokeDispatcher(
       abi.encodePacked(
-        dispatcher.exec768.selector,
         UPGRADE_CONTRACT_ID,
         address(upgradeTester)
       )
@@ -79,7 +74,6 @@ contract UpgradeTest is DispatcherTestBase {
 
     response = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector,
         IMPLEMENTATION_ID
       )
     );
@@ -114,7 +108,6 @@ contract UpgradeTest is DispatcherTestBase {
 
     bytes memory response = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector,
         IMPLEMENTATION_ID
       )
     );
@@ -128,7 +121,6 @@ contract UpgradeTest is DispatcherTestBase {
 
     response = invokeStaticDispatcher(
       abi.encodePacked(
-        dispatcher.get1959.selector,
         IMPLEMENTATION_ID
       )
     );

diff --git a/test/components/dispatcher/utils/DispatcherTestBase.sol b/test/components/dispatcher/utils/DispatcherTestBase.sol
@@ -41,17 +41,19 @@ contract DispatcherTestBase is Test {
     _setUp1();
   }
 
-  function invokeStaticDispatcher(bytes memory encoded) view internal returns (bytes memory data) {
-    (bool success, bytes memory result) = address(dispatcher).staticcall(encoded);
+  function invokeStaticDispatcher(bytes memory messages) view internal returns (bytes memory data) {
+    bytes memory getCall = abi.encodePacked(dispatcher.get1959.selector, messages);
+    (bool success, bytes memory result) = address(dispatcher).staticcall(getCall);
     return decodeBytesResult(success, result);
   }
 
-  function invokeDispatcher(bytes memory encoded) internal returns (bytes memory data) {
-    return invokeDispatcher(encoded, 0);
+  function invokeDispatcher(bytes memory messages) internal returns (bytes memory data) {
+    return invokeDispatcher(messages, 0);
   }
 
-  function invokeDispatcher(bytes memory encoded, uint value) internal returns (bytes memory data) {
-    (bool success, bytes memory result) = address(dispatcher).call{value: value}(encoded);
+  function invokeDispatcher(bytes memory messages, uint value) internal returns (bytes memory data) {
+    bytes memory execCall = abi.encodePacked(dispatcher.exec768.selector, messages);
+    (bool success, bytes memory result) = address(dispatcher).call{value: value}(execCall);
     return decodeBytesResult(success, result);
   }