Move interface definitions to implementation folders for predeploys

packages/contracts/contracts/optimistic-ethereum/OVM/bridge/messaging/OVM_L2CrossDomainMessenger.sol

@@ -8,8 +8,8 @@ import { Lib_CrossDomainUtils } from "../../../libraries/bridge/Lib_CrossDomainU
 
 /* Interface Imports */
 import { iOVM_L2CrossDomainMessenger } from "./iOVM_L2CrossDomainMessenger.sol";
-import { iOVM_L1MessageSender } from "../../../iOVM/predeploys/iOVM_L1MessageSender.sol";
-import { iOVM_L2ToL1MessagePasser } from "../../../iOVM/predeploys/iOVM_L2ToL1MessagePasser.sol";
+import { iOVM_L1MessageSender } from "../../predeploys/iOVM_L1MessageSender.sol";
+import { iOVM_L2ToL1MessagePasser } from "../../predeploys/iOVM_L2ToL1MessagePasser.sol";
 
 /* External Imports */
 import { ReentrancyGuard } from "@openzeppelin/contracts/utils/ReentrancyGuard.sol";

packages/contracts/contracts/optimistic-ethereum/OVM/predeploys/OVM_DeployerWhitelist.sol

@@ -18,7 +18,7 @@ contract OVM_DeployerWhitelist {
 
     bool public initialized;
     bool public allowArbitraryDeployment;
-    address override public owner;
+    address public owner;
     mapping (address => bool) public whitelist;
 
 
@@ -51,7 +51,6 @@ contract OVM_DeployerWhitelist {
         address _owner,
         bool _allowArbitraryDeployment
     )
-        override
         external
     {
         if (initialized == true) {
@@ -72,7 +71,6 @@ contract OVM_DeployerWhitelist {
         address _deployer,
         bool _isWhitelisted
     )
-        override
         external
         onlyOwner
     {
@@ -86,7 +84,6 @@ contract OVM_DeployerWhitelist {
     function setOwner(
         address _owner
     )
-        override
         public
         onlyOwner
     {
@@ -100,7 +97,6 @@ contract OVM_DeployerWhitelist {
     function setAllowArbitraryDeployment(
         bool _allowArbitraryDeployment
     )
-        override
         public
         onlyOwner
     {
@@ -111,7 +107,6 @@ contract OVM_DeployerWhitelist {
      * Permanently enables arbitrary contract deployment and deletes the owner.
      */
     function enableArbitraryContractDeployment()
-        override
         external
         onlyOwner
     {
@@ -127,7 +122,6 @@ contract OVM_DeployerWhitelist {
     function isDeployerAllowed(
         address _deployer
     )
-        override
         external
         returns (
             bool

packages/contracts/contracts/optimistic-ethereum/OVM/predeploys/OVM_L2ToL1MessagePasser.sol

@@ -2,7 +2,7 @@
 pragma solidity >0.5.0 <0.8.0;
 
 /* Interface Imports */
-import { iOVM_L2ToL1MessagePasser } from "../../iOVM/predeploys/iOVM_L2ToL1MessagePasser.sol";
+import { iOVM_L2ToL1MessagePasser } from "./iOVM_L2ToL1MessagePasser.sol";
 
 /**
  * @title OVM_L2ToL1MessagePasser