chore: rm unused imports

smartcontractkit · Jul 4, 2024 · c11361b · c11361b
1 parent e27962b
commit c11361b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 21 deletions.
diff --git a/contracts/src/v0.8/ccip/RMN.sol b/contracts/src/v0.8/ccip/RMN.sol
@@ -5,13 +5,7 @@ import {IRMN} from "./interfaces/IRMN.sol";
 
 import {EnumerableSet} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/structs/EnumerableSet.sol";
 
-import {
-  GLOBAL_CURSE_SUBJECT,
-  LEGACY_CURSE_SUBJECT,
-  LIFT_CURSE_VOTE_ADDR,
-  OWNER_CURSE_VOTE_ADDR,
-  RMNBase
-} from "./RMNBase.sol";
+import {GLOBAL_CURSE_SUBJECT, RMNBase} from "./RMNBase.sol";
 
 /// @dev This contract is owned by RMN, if changing, please notify the RMN maintainers.
 // solhint-disable chainlink-solidity/explicit-returns

diff --git a/contracts/src/v0.8/ccip/RMNOffChainBlessor.sol b/contracts/src/v0.8/ccip/RMNOffChainBlessor.sol
@@ -5,13 +5,7 @@ import {EnumerableSet} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/ut
 import {IAny2EVMMultiOffRamp} from "./interfaces/IAny2EVMMultiOffRamp.sol";
 import {IRMNOffChainBlessor} from "./interfaces/IRMNOffChainBlessor.sol";
 
-import {
-  GLOBAL_CURSE_SUBJECT,
-  LEGACY_CURSE_SUBJECT,
-  LIFT_CURSE_VOTE_ADDR,
-  OWNER_CURSE_VOTE_ADDR,
-  RMNBase
-} from "./RMNBase.sol";
+import {RMNBase} from "./RMNBase.sol";
 
 /// @dev This contract is owned by RMN, if changing, please notify the RMN maintainers.
 // solhint-disable chainlink-solidity/explicit-returns

diff --git a/contracts/src/v0.8/ccip/interfaces/IAny2EVMMultiOffRamp.sol b/contracts/src/v0.8/ccip/interfaces/IAny2EVMMultiOffRamp.sol
@@ -16,10 +16,4 @@ interface IAny2EVMMultiOffRamp {
     bytes32 merkleRoot; // Merkle root covering the interval & source chain messages
     bytes[] rmnSignatures; // RMN signatures for root blessing
   }
-
-  /// @notice Returns the the current nonce for a receiver.
-  /// @param sourceChainSelector The source chain to retrieve the nonce for
-  /// @param sender The sender address
-  /// @return nonce The nonce value belonging to the sender address.
-  function getSenderNonce(uint64 sourceChainSelector, address sender) external view returns (uint64 nonce);
 }
diff --git a/contracts/src/v0.8/ccip/offRamp/EVM2EVMMultiOffRamp.sol b/contracts/src/v0.8/ccip/offRamp/EVM2EVMMultiOffRamp.sol
@@ -3,6 +3,8 @@ pragma solidity 0.8.24;
 
 import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 import {IAny2EVMMessageReceiver} from "../interfaces/IAny2EVMMessageReceiver.sol";
+
+import {IAny2EVMMultiOffRamp} from "../interfaces/IAny2EVMMultiOffRamp.sol";
 import {IMessageInterceptor} from "../interfaces/IMessageInterceptor.sol";
 import {INonceManager} from "../interfaces/INonceManager.sol";
 import {IPoolV1} from "../interfaces/IPool.sol";
@@ -29,7 +31,7 @@ import {ERC165Checker} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts
 /// @dev MultiOCR3Base is used to store multiple OCR configs for both the OffRamp and the CommitStore.
 /// The execution plugin type has to be configured without signature verification, and the commit
 /// plugin type with verification.
-contract EVM2EVMMultiOffRamp is ITypeAndVersion, MultiOCR3Base {
+contract EVM2EVMMultiOffRamp is IAny2EVMMultiOffRamp, ITypeAndVersion, MultiOCR3Base {
   using ERC165Checker for address;
   using EnumerableMapAddresses for EnumerableMapAddresses.AddressToAddressMap;