Add tests for hook type

solidity/contracts/hooks/OPStackHook.sol

@@ -58,13 +58,7 @@ contract OPStackHook is AbstractMessageIdAuthHook {
         l1Messenger = ICrossDomainMessenger(_l1Messenger);
     }
 
-    // ============ External functions ============
-
-    /// @inheritdoc IPostDispatchHook
-    function hookType() external pure override returns (uint8) {
-        return uint8(IPostDispatchHook.Types.OP_STACK);
-    }
-
+    // ============ Internal functions ============
     function _quoteDispatch(bytes calldata, bytes calldata)
         internal
         pure
@@ -74,8 +68,6 @@ contract OPStackHook is AbstractMessageIdAuthHook {
         return 0; // gas subsidized by the L2
     }
 
-    // ============ Internal functions ============
-
     /// @inheritdoc AbstractMessageIdAuthHook
     function _sendMessageId(bytes calldata metadata, bytes memory payload)
         internal

solidity/contracts/hooks/aggregation/ERC5164Hook.sol

@@ -43,13 +43,6 @@ contract ERC5164Hook is AbstractMessageIdAuthHook {
         dispatcher = IMessageDispatcher(_dispatcher);
     }
 
-    // ============ External Functions ============
-
-    /// @inheritdoc IPostDispatchHook
-    function hookType() external pure override returns (uint8) {
-        return uint8(IPostDispatchHook.Types.ERC_5164);
-    }
-
     // ============ Internal Functions ============
 
     function _quoteDispatch(bytes calldata, bytes calldata)

solidity/contracts/hooks/igp/InterchainGasPaymaster.sol

@@ -94,7 +94,7 @@ contract InterchainGasPaymaster is
 
     /// @inheritdoc IPostDispatchHook
     function hookType() external pure override returns (uint8) {
-        return uint8(IPostDispatchHook.Types.IGP);
+        return uint8(IPostDispatchHook.Types.INTERCHAIN_GAS_PAYMASTER);
     }
 
     /**

solidity/contracts/hooks/libs/AbstractMessageIdAuthHook.sol

@@ -14,6 +14,7 @@ pragma solidity >=0.8.0;
 @@@@@@@@@       @@@@@@@@*/
 
 // ============ Internal Imports ============
+import {IPostDispatchHook} from "../../interfaces/hooks/IPostDispatchHook.sol";
 import {AbstractPostDispatchHook} from "./AbstractPostDispatchHook.sol";
 import {AbstractMessageIdAuthorizedIsm} from "../../isms/hook/AbstractMessageIdAuthorizedIsm.sol";
 import {TypeCasts} from "../../libs/TypeCasts.sol";
@@ -56,6 +57,11 @@ abstract contract AbstractMessageIdAuthHook is
         destinationDomain = _destinationDomain;
     }
 
+    /// @inheritdoc IPostDispatchHook
+    function hookType() external pure returns (uint8) {
+        return uint8(IPostDispatchHook.Types.ID_AUTH_ISM);
+    }
+
     // ============ Internal functions ============
 
     /// @inheritdoc AbstractPostDispatchHook

solidity/contracts/interfaces/hooks/IPostDispatchHook.sol

@@ -19,10 +19,9 @@ interface IPostDispatchHook {
         ROUTING,
         AGGREGATION,
         MERKLE_TREE,
-        ERC_5164,
+        INTERCHAIN_GAS_PAYMASTER,
         FALLBACK_ROUTING,
-        IGP,
-        OP_STACK,
+        ID_AUTH_ISM,
         PAUSABLE,
         PROTOCOL_FEE
     }

solidity/test/MerkleTreeHook.t.sol

@@ -7,6 +7,7 @@ import {Message} from "../contracts/libs/Message.sol";
 import {TypeCasts} from "../contracts/libs/TypeCasts.sol";
 import {TestMerkleTreeHook} from "../contracts/test/TestMerkleTreeHook.sol";
 import {TestMailbox} from "../contracts/test/TestMailbox.sol";
+import {IPostDispatchHook} from "../contracts/interfaces/hooks/IPostDispatchHook.sol";
 
 contract MerkleTreeHookTest is Test {
     using Message for bytes;
@@ -68,4 +69,8 @@ contract MerkleTreeHookTest is Test {
             assertEq(hook.quoteDispatch("", currMessage), 0);
         }
     }
+
+    function testHookType() public {
+        assertEq(hook.hookType(), uint8(IPostDispatchHook.Types.MERKLE_TREE));
+    }
 }

solidity/test/hooks/AggregationHook.t.sol

@@ -6,6 +6,7 @@ import {Test} from "forge-std/Test.sol";
 import {StaticAggregationHook} from "../../contracts/hooks/aggregation/StaticAggregationHook.sol";
 import {StaticAggregationHookFactory} from "../../contracts/hooks/aggregation/StaticAggregationHookFactory.sol";
 import {TestPostDispatchHook} from "../../contracts/test/TestPostDispatchHook.sol";
+import {IPostDispatchHook} from "../../contracts/interfaces/hooks/IPostDispatchHook.sol";
 
 contract AggregationHookTest is Test {
     StaticAggregationHookFactory internal factory;
@@ -88,4 +89,9 @@ contract AggregationHookTest is Test {
         address[] memory actualHook = hook.hooks("");
         assertEq(actualHook, expectedHooks);
     }
+
+    function testHookType() public {
+        deployHooks(1, 0);
+        assertEq(hook.hookType(), uint8(IPostDispatchHook.Types.AGGREGATION));
+    }
 }

solidity/test/hooks/DomainRoutingHook.t.sol

@@ -8,6 +8,7 @@ import {DomainRoutingHook} from "../../contracts/hooks/routing/DomainRoutingHook
 import {FallbackDomainRoutingHook} from "../../contracts/hooks/routing/FallbackDomainRoutingHook.sol";
 import {TestPostDispatchHook} from "../../contracts/test/TestPostDispatchHook.sol";
 import {TestMailbox} from "../../contracts/test/TestMailbox.sol";
+import {IPostDispatchHook} from "../../contracts/interfaces/hooks/IPostDispatchHook.sol";
 
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 
@@ -104,6 +105,10 @@ contract DomainRoutingHookTest is Test {
         vm.expectRevert();
         hook.postDispatch(metadata, testMessage);
     }
+
+    function testHookType() public virtual {
+        assertEq(hook.hookType(), uint8(IPostDispatchHook.Types.ROUTING));
+    }
 }
 
 contract FallbackDomainRoutingHookTest is DomainRoutingHookTest {
@@ -162,4 +167,11 @@ contract FallbackDomainRoutingHookTest is DomainRoutingHookTest {
         );
         hook.postDispatch(metadata, testMessage);
     }
+
+    function testHookType() public override {
+        assertEq(
+            hook.hookType(),
+            uint8(IPostDispatchHook.Types.FALLBACK_ROUTING)
+        );
+    }
 }

solidity/test/hooks/StaticProtocolFee.t.sol

@@ -5,6 +5,7 @@ import {Test} from "forge-std/Test.sol";
 import {TypeCasts} from "../../contracts/libs/TypeCasts.sol";
 import {MessageUtils} from "../isms/IsmTestUtils.sol";
 import {StandardHookMetadata} from "../../contracts/hooks/libs/StandardHookMetadata.sol";
+import {IPostDispatchHook} from "../../contracts/interfaces/hooks/IPostDispatchHook.sol";
 
 import {StaticProtocolFee} from "../../contracts/hooks/StaticProtocolFee.sol";
 
@@ -35,6 +36,10 @@ contract StaticProtocolFeeTest is Test {
         assertEq(fees.protocolFee(), FEE);
     }
 
+    function testHookType() public {
+        assertEq(fees.hookType(), uint8(IPostDispatchHook.Types.PROTOCOL_FEE));
+    }
+
     function testSetProtocolFee(uint256 fee) public {
         fee = bound(fee, 0, fees.MAX_PROTOCOL_FEE());
         fees.setProtocolFee(fee);

solidity/test/igps/InterchainGasPaymaster.t.sol

@@ -11,6 +11,7 @@ import {TypeCasts} from "../../contracts/libs/TypeCasts.sol";
 import {InterchainGasPaymaster} from "../../contracts/hooks/igp/InterchainGasPaymaster.sol";
 import {StorageGasOracle} from "../../contracts/hooks/igp/StorageGasOracle.sol";
 import {IGasOracle} from "../../contracts/interfaces/IGasOracle.sol";
+import {IPostDispatchHook} from "../../contracts/interfaces/hooks/IPostDispatchHook.sol";
 
 contract InterchainGasPaymasterTest is Test {
     using StandardHookMetadata for bytes;
@@ -534,6 +535,13 @@ contract InterchainGasPaymasterTest is Test {
         assertEq(_igpBalanceAfter - _igpBalanceBefore, _quote);
     }
 
+    function testHookType() public {
+        assertEq(
+            igp.hookType(),
+            uint8(IPostDispatchHook.Types.INTERCHAIN_GAS_PAYMASTER)
+        );
+    }
+
     // ============ claim ============
 
     function testClaim() public {

solidity/test/isms/ERC5164ISM.t.sol

@@ -9,6 +9,8 @@ import {MessageUtils} from "./IsmTestUtils.sol";
 import {TypeCasts} from "../../contracts/libs/TypeCasts.sol";
 
 import {IMessageDispatcher} from "../../contracts/interfaces/hooks/IMessageDispatcher.sol";
+import {IPostDispatchHook} from "../../contracts/interfaces/hooks/IPostDispatchHook.sol";
+import {IInterchainSecurityModule} from "../../contracts/interfaces/IInterchainSecurityModule.sol";
 import {ERC5164Hook} from "../../contracts/hooks/aggregation/ERC5164Hook.sol";
 import {AbstractMessageIdAuthorizedIsm} from "../../contracts/isms/hook/AbstractMessageIdAuthorizedIsm.sol";
 import {ERC5164Ism} from "../../contracts/isms/hook/ERC5164Ism.sol";
@@ -132,6 +134,11 @@ contract ERC5164IsmTest is Test {
         hook.postDispatch(bytes(""), encodedMessage);
     }
 
+    function testTypes() public {
+        assertEq(hook.hookType(), uint8(IPostDispatchHook.Types.ID_AUTH_ISM));
+        assertEq(ism.moduleType(), uint8(IInterchainSecurityModule.Types.NULL));
+    }
+
     function test_postDispatch_RevertWhen_ChainIDNotSupported() public {
         encodedMessage = MessageUtils.formatMessage(
             VERSION,