diff --git a/contracts/ccip/GovernanceCCIPRelay.sol b/contracts/ccip/GovernanceCCIPRelay.sol index b006715..0e947b2 100644 --- a/contracts/ccip/GovernanceCCIPRelay.sol +++ b/contracts/ccip/GovernanceCCIPRelay.sol @@ -12,7 +12,7 @@ import {IGovernanceCCIPRelay} from "./interfaces/IGovernanceCCIPRelay.sol"; */ contract GovernanceCCIPRelay is IGovernanceCCIPRelay { /// @inheritdoc IGovernanceCCIPRelay - IRouterClient public immutable ccipRouter; + IRouterClient public immutable CCIP_ROUTER; /// @inheritdoc IGovernanceCCIPRelay address public immutable TIMELOCK; @@ -40,7 +40,7 @@ contract GovernanceCCIPRelay is IGovernanceCCIPRelay { uint64 _destinationChainSelector, address _receiver ) { - ccipRouter = IRouterClient(_router); + CCIP_ROUTER = IRouterClient(_router); TIMELOCK = _timelock; destinationChainSelector = _destinationChainSelector; destinationReceiver = _receiver; @@ -70,11 +70,11 @@ contract GovernanceCCIPRelay is IGovernanceCCIPRelay { // Calculate the required fee uint256 msgValue = msg.value; - uint256 fee = ccipRouter.getFee(destinationChainSelector, message); + uint256 fee = CCIP_ROUTER.getFee(destinationChainSelector, message); require(msgValue >= fee, InsufficientFee(msg.value, fee)); // Send the message via CCIP - messageId = ccipRouter.ccipSend{value: fee}( + messageId = CCIP_ROUTER.ccipSend{value: fee}( destinationChainSelector, message ); diff --git a/contracts/ccip/interfaces/IGovernanceCCIPRelay.sol b/contracts/ccip/interfaces/IGovernanceCCIPRelay.sol index 371c0dd..89b7008 100644 --- a/contracts/ccip/interfaces/IGovernanceCCIPRelay.sol +++ b/contracts/ccip/interfaces/IGovernanceCCIPRelay.sol @@ -35,7 +35,7 @@ interface IGovernanceCCIPRelay { /// @notice Returns the address of the CCIP router contract. /// @return The address of the CCIP router. - function ccipRouter() external view returns (IRouterClient); + function CCIP_ROUTER() external view returns (IRouterClient); /// @notice Returns the address of the timelock contract. /// @return The address of the timelock. diff --git a/test/ccip/GovernanceCCIPRelayTest.t.sol b/test/ccip/GovernanceCCIPRelayTest.t.sol index 61c2ace..e2fc936 100644 --- a/test/ccip/GovernanceCCIPRelayTest.t.sol +++ b/test/ccip/GovernanceCCIPRelayTest.t.sol @@ -28,7 +28,7 @@ contract GovernanceCCIPRelayTest is Test { function testConstructorSetsArgumentsCorrectly() public { assertEq(relay.TIMELOCK(), timelock, "Timelock address mismatch"); assertEq( - address(relay.ccipRouter()), + address(relay.CCIP_ROUTER()), ccipRouter, "Router address mismatch" );