From ae7bd524959db61d1d4e2f22d75956dbc0a6e5e6 Mon Sep 17 00:00:00 2001 From: LayneHaber Date: Thu, 26 Jan 2023 15:08:13 -0700 Subject: [PATCH] q5 --- .../connectors/mainnet/MainnetSpokeConnector.sol | 6 ------ .../connectors/mainnet/MainnetSpokeConnector.t.sol | 10 +++++++++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/deployments/contracts/contracts/messaging/connectors/mainnet/MainnetSpokeConnector.sol b/packages/deployments/contracts/contracts/messaging/connectors/mainnet/MainnetSpokeConnector.sol index c27b20892f..5791aa0f7c 100644 --- a/packages/deployments/contracts/contracts/messaging/connectors/mainnet/MainnetSpokeConnector.sol +++ b/packages/deployments/contracts/contracts/messaging/connectors/mainnet/MainnetSpokeConnector.sol @@ -73,10 +73,4 @@ contract MainnetSpokeConnector is SpokeConnector, IHubConnector { // otherwise is relayer, update the outbound root on the root manager IRootManager(ROOT_MANAGER).aggregate(DOMAIN, bytes32(_data)); } - - /** - * @dev The `RootManager` calls `.sendMessage` on all connectors, there is nothing on mainnet - * that would be processing "inbound messages", so do nothing in this function - */ - function _processMessage(bytes memory _data) internal override {} } diff --git a/packages/deployments/contracts/contracts_forge/messaging/connectors/mainnet/MainnetSpokeConnector.t.sol b/packages/deployments/contracts/contracts_forge/messaging/connectors/mainnet/MainnetSpokeConnector.t.sol index b02528e28b..5e5abe6b2d 100644 --- a/packages/deployments/contracts/contracts_forge/messaging/connectors/mainnet/MainnetSpokeConnector.t.sol +++ b/packages/deployments/contracts/contracts_forge/messaging/connectors/mainnet/MainnetSpokeConnector.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.17; import {IRootManager} from "../../../../contracts/messaging/interfaces/IRootManager.sol"; import {MainnetSpokeConnector} from "../../../../contracts/messaging/connectors/mainnet/MainnetSpokeConnector.sol"; -import {SpokeConnector} from "../../../../contracts/messaging/connectors/SpokeConnector.sol"; +import {SpokeConnector, Connector} from "../../../../contracts/messaging/connectors/SpokeConnector.sol"; import {MerkleTreeManager} from "../../../../contracts/messaging/MerkleTreeManager.sol"; import "../../../utils/ConnectorHelper.sol"; @@ -83,4 +83,12 @@ contract MainnetSpokeConnectorTest is ConnectorHelper { vm.prank(_rootManager); MainnetSpokeConnector(_l1Connector).sendMessage(_data, bytes("")); } + + // ============ MainnetSpokeConnector.processMessage ============ + function test_MainnetSpokeConnector__processMessage_reverts() public { + vm.expectRevert(Connector.Connector__processMessage_notUsed.selector); + + vm.prank(_amb); + MainnetSpokeConnector(_l1Connector).processMessage(bytes("")); + } }