diff --git a/src/AvailBridge.sol b/src/AvailBridge.sol index 6a3dab0..aa42aba 100644 --- a/src/AvailBridge.sol +++ b/src/AvailBridge.sol @@ -4,15 +4,15 @@ pragma solidity ^0.8.23; import {Initializable} from "lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol"; import {ReentrancyGuardUpgradeable} from "lib/openzeppelin-contracts-upgradeable/contracts/utils/ReentrancyGuardUpgradeable.sol"; +import {PausableUpgradeable} from "lib/openzeppelin-contracts-upgradeable/contracts/utils/PausableUpgradeable.sol"; +import {AccessControlDefaultAdminRulesUpgradeable} from + "lib/openzeppelin-contracts-upgradeable/contracts/access/extensions/AccessControlDefaultAdminRulesUpgradeable.sol"; import {SafeERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol"; import {IERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol"; -import {IVectorx} from "src/interfaces/IVectorx.sol"; import {Merkle} from "src/lib/Merkle.sol"; +import {IVectorx} from "src/interfaces/IVectorx.sol"; import {IWrappedAvail} from "src/interfaces/IWrappedAvail.sol"; import {IMessageReceiver} from "src/interfaces/IMessageReceiver.sol"; -import {PausableUpgradeable} from "lib/openzeppelin-contracts-upgradeable/contracts/utils/PausableUpgradeable.sol"; -import {AccessControlDefaultAdminRulesUpgradeable} from - "lib/openzeppelin-contracts-upgradeable/contracts/access/extensions/AccessControlDefaultAdminRulesUpgradeable.sol"; /** * @author @QEDK (Avail) diff --git a/test/AvailBridgeTest.t.sol b/test/AvailBridgeTest.t.sol index be5bd7d..1f752fd 100644 --- a/test/AvailBridgeTest.t.sol +++ b/test/AvailBridgeTest.t.sol @@ -4,14 +4,14 @@ pragma solidity ^0.8.23; import {TransparentUpgradeableProxy} from "lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol"; import {ProxyAdmin} from "lib/openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol"; +import {IAccessControl} from "lib/openzeppelin-contracts/contracts/access/IAccessControl.sol"; import {AvailBridge} from "src/AvailBridge.sol"; import {WrappedAvail, IWrappedAvail} from "src/WrappedAvail.sol"; import {VectorxMock, IVectorx} from "src/mocks/VectorxMock.sol"; import {ERC20Mock} from "src/mocks/ERC20Mock.sol"; import {MessageReceiverMock} from "src/mocks/MessageReceiverMock.sol"; -import {Vm, Test} from "forge-std/Test.sol"; import {MurkyBase} from "lib/murky/src/common/MurkyBase.sol"; -import {IAccessControl} from "lib/openzeppelin-contracts/contracts/access/IAccessControl.sol"; +import {Vm, Test} from "forge-std/Test.sol"; contract AvailBridgeTest is Test, MurkyBase { AvailBridge public bridge;