evm: Fix tests

Author: bruce-riley

evm/src/NttManager/ManagerBase.sol

@@ -142,10 +142,9 @@ abstract contract ManagerBase is
         // The `msg.sender` is the transceiver. Get the index for it.
         uint8 index = _getTransceiverInfosStorage()[msg.sender].index;
 
-        // If this transceiver is not enabled for this chain, ignore this attestation.
         // TODO: Is there a race condition with disabling a transceiver while a tx is outstanding?
         if (!_isRecvTransceiverEnabledForChain(sourceChainId, index)) {
-            return nttManagerMessageHash;
+            revert CallerNotTransceiver(msg.sender);
         }
 
         // set the attested flag for this transceiver.

evm/src/NttManager/TransceiverRegistry.sol

@@ -27,6 +27,11 @@ abstract contract TransceiverRegistryBase {
         uint8 enabled;
     }
 
+    /// @notice Error when attempting to enable an transceiver that is already enabled.
+    /// @dev Selector: TODO.
+    /// @param transceiver The address of the transceiver.
+    error TransceiverAlreadyEnabled(address transceiver);
+
     uint8 public constant MAX_TRANSCEIVERS = 64;
 
     bytes32 internal constant TRANSCEIVER_INFOS_SLOT =
@@ -197,11 +202,6 @@ abstract contract TransceiverRegistry is TransceiverRegistryBase {
     /// @param transceiver The address of the transceiver.
     error NonRegisteredTransceiver(address transceiver);
 
-    /// @notice Error when attempting to enable a transceiver that is already enabled.
-    /// @dev Selector 0x8d68f84d.
-    /// @param transceiver The address of the transceiver.
-    error TransceiverAlreadyEnabled(address transceiver);
-
     /// @notice Error when attempting to use an incorrect chain.
     /// @dev Selector: 0x587c94c3.
     /// @param chain The id of the incorrect chain.
@@ -237,7 +237,7 @@ abstract contract TransceiverRegistry is TransceiverRegistryBase {
         _checkDelegateCallRevert(success, returnData);
     }
 
-    function _enableSendTransceiverForChain(uint16 chain, address transceiver) internal {
+    function enableSendTransceiverForChain(uint16 chain, address transceiver) public {
         (bool success, bytes memory returnData) = _admin.delegatecall(
             abi.encodeWithSelector(
                 TransceiverRegistryAdmin._enableSendTransceiverForChain.selector, chain, transceiver
@@ -246,7 +246,7 @@ abstract contract TransceiverRegistry is TransceiverRegistryBase {
         _checkDelegateCallRevert(success, returnData);
     }
 
-    function _disableSendTransceiverForChain(uint16 chain, address transceiver) internal {
+    function disableSendTransceiverForChain(uint16 chain, address transceiver) public {
         (bool success, bytes memory returnData) = _admin.delegatecall(
             abi.encodeWithSelector(
                 TransceiverRegistryAdmin._disableSendTransceiverForChain.selector,
@@ -257,7 +257,7 @@ abstract contract TransceiverRegistry is TransceiverRegistryBase {
         _checkDelegateCallRevert(success, returnData);
     }
 
-    function _enableRecvTransceiverForChain(uint16 chain, address transceiver) internal {
+    function enableRecvTransceiverForChain(uint16 chain, address transceiver) public {
         (bool success, bytes memory returnData) = _admin.delegatecall(
             abi.encodeWithSelector(
                 TransceiverRegistryAdmin._enableRecvTransceiverForChain.selector, chain, transceiver
@@ -266,10 +266,12 @@ abstract contract TransceiverRegistry is TransceiverRegistryBase {
         _checkDelegateCallRevert(success, returnData);
     }
 
-    function _disableRecvTransceiverForChain(uint16 chain, address transceiver) internal {
+    function disableRecvTransceiverForChain(uint16 chain, address transceiver) public {
         (bool success, bytes memory returnData) = _admin.delegatecall(
             abi.encodeWithSelector(
-                TransceiverRegistryAdmin._enableRecvTransceiverForChain.selector, chain, transceiver
+                TransceiverRegistryAdmin._disableRecvTransceiverForChain.selector,
+                chain,
+                transceiver
             )
         );
         _checkDelegateCallRevert(success, returnData);
@@ -395,11 +397,6 @@ contract TransceiverRegistryAdmin is TransceiverRegistryBase {
     /// @param transceiver The address of the transceiver.
     event RecvTransceiverDisabledForChain(uint16 chain, address transceiver);
 
-    /// @notice Error when attempting to enable an transceiver that is already enabled.
-    /// @dev Selector: TODO.
-    /// @param transceiver The address of the transceiver.
-    error TransceiverAlreadyEnabled(address transceiver);
-
     /// @notice Error when the transceiver is the zero address.
     /// @dev Selector: TODO.
     error InvalidTransceiverZeroAddress();
@@ -455,7 +452,7 @@ contract TransceiverRegistryAdmin is TransceiverRegistryBase {
             _enabledTransceiverBitmap.bitmap | uint64(1 << transceiverInfos[transceiver].index);
         // ensure that this actually changed the bitmap
         if (updatedEnabledTransceiverBitmap == _enabledTransceiverBitmap.bitmap) {
-            revert TransceiverRegistry.TransceiverAlreadyEnabled(transceiver);
+            revert TransceiverAlreadyEnabled(transceiver);
         }
         _enabledTransceiverBitmap.bitmap = updatedEnabledTransceiverBitmap;
 

evm/test/NttManager.t.sol

@@ -305,7 +305,7 @@ contract TestNttManager is Test, IRateLimiterEvents {
 
         vm.expectRevert(
             abi.encodeWithSelector(
-                TransceiverRegistry.TransceiverAlreadyEnabled.selector, address(e)
+                TransceiverRegistryBase.TransceiverAlreadyEnabled.selector, address(e)
             )
         );
         nttManager.setTransceiver(address(e));

evm/test/NttManagerNoRateLimiting.t.sol

@@ -233,7 +233,7 @@ contract TestNttManagerNoRateLimiting is Test, IRateLimiterEvents {
 
         vm.expectRevert(
             abi.encodeWithSelector(
-                TransceiverRegistry.TransceiverAlreadyEnabled.selector, address(e)
+                TransceiverRegistryBase.TransceiverAlreadyEnabled.selector, address(e)
             )
         );
         nttManager.setTransceiver(address(e));

evm/test/libraries/TransceiverHelpers.sol

@@ -26,6 +26,38 @@ library TransceiverHelpersLib {
         return (e1, e2);
     }
 
+    function setup_transceivers(
+        uint16 chainId,
+        NttManager nttManager
+    ) internal returns (DummyTransceiver, DummyTransceiver) {
+        DummyTransceiver e1 = new DummyTransceiver(address(nttManager));
+        DummyTransceiver e2 = new DummyTransceiver(address(nttManager));
+        nttManager.setTransceiver(address(e1));
+        nttManager.enableSendTransceiverForChain(chainId, address(e1));
+        nttManager.enableRecvTransceiverForChain(chainId, address(e1));
+        nttManager.setTransceiver(address(e2));
+        nttManager.enableSendTransceiverForChain(chainId, address(e2));
+        nttManager.enableRecvTransceiverForChain(chainId, address(e2));
+        nttManager.setThreshold(2);
+        return (e1, e2);
+    }
+
+    function setAndEnableTransceiver(NttManager nttMgr, uint16 chnId, address transceiver) public {
+        nttMgr.setTransceiver(address(transceiver));
+        nttMgr.enableSendTransceiverForChain(chnId, address(transceiver));
+        nttMgr.enableRecvTransceiverForChain(chnId, address(transceiver));
+    }
+
+    function disableAndRemoveTransceiver(
+        NttManager nttMgr,
+        uint16 chnId,
+        address transceiver
+    ) public {
+        nttMgr.disableSendTransceiverForChain(chnId, address(transceiver));
+        nttMgr.disableRecvTransceiverForChain(chnId, address(transceiver));
+        nttMgr.removeTransceiver(address(transceiver));
+    }
+
     function attestTransceiversHelper(
         address to,
         bytes32 id,