diff --git a/test/integration/IntegrationDeployer.t.sol b/test/integration/IntegrationDeployer.t.sol index 3ef617af..7aafb918 100644 --- a/test/integration/IntegrationDeployer.t.sol +++ b/test/integration/IntegrationDeployer.t.sol @@ -22,8 +22,7 @@ import "eigenlayer-contracts/src/contracts/pods/EigenPod.sol"; import "eigenlayer-contracts/src/contracts/pods/DelayedWithdrawalRouter.sol"; import "eigenlayer-contracts/src/contracts/permissions/PauserRegistry.sol"; import "eigenlayer-contracts/src/test/mocks/ETHDepositMock.sol"; -// import "eigenlayer-contracts/src/test/integration/mocks/BeaconChainOracleMock.t.sol"; -import "test/integration/mocks/BeaconChainOracleMock.t.sol"; +import {BeaconChainOracleMock} from "eigenlayer-contracts/src/test/integration/mocks/BeaconChainOracleMock.t.sol"; // Middleware contracts import "src/RegistryCoordinator.sol"; @@ -306,7 +305,7 @@ abstract contract IntegrationDeployer is Test, IUserDeployer { TransparentUpgradeableProxy(payable(address(stakeRegistry))), address(stakeRegistryImplementation) ); - + proxyAdmin.upgrade( TransparentUpgradeableProxy(payable(address(blsApkRegistry))), address(blsApkRegistryImplementation) @@ -347,7 +346,7 @@ abstract contract IntegrationDeployer is Test, IUserDeployer { /// @dev Deploy a strategy and its underlying token, push to global lists of tokens/strategies, and whitelist /// strategy in strategyManager function _newStrategyAndToken(string memory tokenName, string memory tokenSymbol, uint initialSupply, address owner) internal { - IERC20 underlyingToken = new ERC20PresetFixedSupply(tokenName, tokenSymbol, initialSupply, owner); + IERC20 underlyingToken = new ERC20PresetFixedSupply(tokenName, tokenSymbol, initialSupply, owner); StrategyBase strategy = StrategyBase( address( new TransparentUpgradeableProxy( diff --git a/test/integration/mocks/BeaconChainOracleMock.t.sol b/test/integration/mocks/BeaconChainOracleMock.t.sol deleted file mode 100644 index fadb7555..00000000 --- a/test/integration/mocks/BeaconChainOracleMock.t.sol +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-License-Identifier: BUSL-1.1 -pragma solidity =0.8.12; - -import "eigenlayer-contracts/src/contracts/interfaces/IBeaconChainOracle.sol"; - -// NOTE: There's a copy of this file in the core repo, but importing that was causing -// the compiler to complain for an unfathomable reason. Apparently reimplementing it -// here fixes the issue. -contract BeaconChainOracleMock is IBeaconChainOracle { - - mapping(uint64 => bytes32) blockRoots; - - function timestampToBlockRoot(uint timestamp) public view returns (bytes32) { - return blockRoots[uint64(timestamp)]; - } - - function setBlockRoot(uint64 timestamp, bytes32 blockRoot) public { - blockRoots[timestamp] = blockRoot; - } -} \ No newline at end of file