Commit 87f745b5 authored by smartcontracts's avatar smartcontracts Committed by GitHub

fix(ctb): clean up compiler warnings (#3020)

Cleans up various compiler warnings throughout the package.
Co-authored-by: default avatarMark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: default avatarmergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
parent 0a86b91c
---
'@eth-optimism/contracts-bedrock': patch
---
Cleans up various compiler warnings
This diff is collapsed.
...@@ -23,87 +23,62 @@ contract LegacyERC20ETH is OptimismMintableERC20 { ...@@ -23,87 +23,62 @@ contract LegacyERC20ETH is OptimismMintableERC20 {
{} {}
/** /**
* @custom:blocked
* @notice Mints some amount of ETH. * @notice Mints some amount of ETH.
*
* @param _to Address of the recipient.
* @param _amount Amount of ETH to mint.
*/ */
function mint(address _to, uint256 _amount) public virtual override { function mint(address, uint256) public virtual override {
revert("LegacyERC20ETH: mint is disabled"); revert("LegacyERC20ETH: mint is disabled");
} }
/** /**
* @custom:blocked
* @notice Burns some amount of ETH. * @notice Burns some amount of ETH.
*
* @param _from Address to burn from.
* @param _amount Amount of ETH to burn.
*/ */
function burn(address _from, uint256 _amount) public virtual override { function burn(address, uint256) public virtual override {
revert("LegacyERC20ETH: burn is disabled"); revert("LegacyERC20ETH: burn is disabled");
} }
/** /**
* @custom:blocked
* @notice Transfers some amount of ETH. * @notice Transfers some amount of ETH.
*
* @param _recipient Address to send to.
* @param _amount Amount of ETH to send.
*/ */
function transfer(address _recipient, uint256 _amount) public virtual override returns (bool) { function transfer(address, uint256) public virtual override returns (bool) {
revert("LegacyERC20ETH: transfer is disabled"); revert("LegacyERC20ETH: transfer is disabled");
} }
/** /**
* @custom:blocked
* @notice Approves a spender to spend some amount of ETH. * @notice Approves a spender to spend some amount of ETH.
*
* @param _spender Address of the spender.
* @param _amount Amount of ETH to approve.
*/ */
function approve(address _spender, uint256 _amount) public virtual override returns (bool) { function approve(address, uint256) public virtual override returns (bool) {
revert("LegacyERC20ETH: approve is disabled"); revert("LegacyERC20ETH: approve is disabled");
} }
/** /**
* @custom:blocked
* @notice Transfers funds from some sender account. * @notice Transfers funds from some sender account.
*
* @param _sender Address of the sender.
* @param _recipient Address of the recipient.
* @param _amount Amount of ETH to transfer.
*/ */
function transferFrom( function transferFrom(
address _sender, address,
address _recipient, address,
uint256 _amount uint256
) public virtual override returns (bool) { ) public virtual override returns (bool) {
revert("LegacyERC20ETH: transferFrom is disabled"); revert("LegacyERC20ETH: transferFrom is disabled");
} }
/** /**
* @custom:blocked
* @notice Increases the allowance of a spender. * @notice Increases the allowance of a spender.
*
* @param _spender Address of the spender.
* @param _addedValue Amount of ETH to increase the allowance by.
*/ */
function increaseAllowance(address _spender, uint256 _addedValue) function increaseAllowance(address, uint256) public virtual override returns (bool) {
public
virtual
override
returns (bool)
{
revert("LegacyERC20ETH: increaseAllowance is disabled"); revert("LegacyERC20ETH: increaseAllowance is disabled");
} }
/** /**
* @custom:blocked
* @notice Decreases the allowance of a spender. * @notice Decreases the allowance of a spender.
*
* @param _spender Address of the spender.
* @param _subtractedValue Amount of ETH to decrease the allowance by.
*/ */
function decreaseAllowance(address _spender, uint256 _subtractedValue) function decreaseAllowance(address, uint256) public virtual override returns (bool) {
public
virtual
override
returns (bool)
{
revert("LegacyERC20ETH: decreaseAllowance is disabled"); revert("LegacyERC20ETH: decreaseAllowance is disabled");
} }
} }
...@@ -198,7 +198,6 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer { ...@@ -198,7 +198,6 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
address sender = PredeployAddresses.L2_CROSS_DOMAIN_MESSENGER; address sender = PredeployAddresses.L2_CROSS_DOMAIN_MESSENGER;
uint256 senderSlotIndex = 51; uint256 senderSlotIndex = 51;
bytes32 slotValue = vm.load(address(op), bytes32(senderSlotIndex));
vm.store(address(op), bytes32(senderSlotIndex), bytes32(abi.encode(sender))); vm.store(address(op), bytes32(senderSlotIndex), bytes32(abi.encode(sender)));
vm.prank(address(op)); vm.prank(address(op));
......
...@@ -59,7 +59,8 @@ contract L1StandardBridge_Test is Bridge_Initializer { ...@@ -59,7 +59,8 @@ contract L1StandardBridge_Test is Bridge_Initializer {
); );
vm.prank(alice, alice); vm.prank(alice, alice);
address(L1Bridge).call{ value: 100 }(hex""); (bool success,) = address(L1Bridge).call{ value: 100 }(hex"");
assertEq(success, true);
assertEq(address(op).balance, 100); assertEq(address(op).balance, 100);
} }
......
...@@ -357,12 +357,22 @@ contract L2OutputOracleUpgradeable_Test is L2OutputOracle_Initializer { ...@@ -357,12 +357,22 @@ contract L2OutputOracleUpgradeable_Test is L2OutputOracle_Initializer {
function test_cannotInitProxy() external { function test_cannotInitProxy() external {
vm.expectRevert("Initializable: contract is already initialized"); vm.expectRevert("Initializable: contract is already initialized");
address(proxy).call(abi.encodeWithSelector(L2OutputOracle.initialize.selector)); L2OutputOracle(payable(proxy)).initialize(
genesisL2Output,
startingBlockNumber,
sequencer,
owner
);
} }
function test_cannotInitImpl() external { function test_cannotInitImpl() external {
vm.expectRevert("Initializable: contract is already initialized"); vm.expectRevert("Initializable: contract is already initialized");
address(oracleImpl).call(abi.encodeWithSelector(L2OutputOracle.initialize.selector)); L2OutputOracle(oracleImpl).initialize(
genesisL2Output,
startingBlockNumber,
sequencer,
owner
);
} }
function test_upgrading() external { function test_upgrading() external {
......
...@@ -40,7 +40,8 @@ contract L2StandardBridge_Test is Bridge_Initializer { ...@@ -40,7 +40,8 @@ contract L2StandardBridge_Test is Bridge_Initializer {
// TODO: events from each contract // TODO: events from each contract
vm.prank(alice, alice); vm.prank(alice, alice);
address(L2Bridge).call{ value: 100 }(hex""); (bool success,) = address(L2Bridge).call{ value: 100 }(hex"");
assertEq(success, true);
assertEq(address(messagePasser).balance, 100); assertEq(address(messagePasser).balance, 100);
} }
......
...@@ -334,12 +334,12 @@ contract OptimismPortalUpgradeable_Test is Portal_Initializer { ...@@ -334,12 +334,12 @@ contract OptimismPortalUpgradeable_Test is Portal_Initializer {
function test_cannotInitProxy() external { function test_cannotInitProxy() external {
vm.expectRevert("Initializable: contract is already initialized"); vm.expectRevert("Initializable: contract is already initialized");
address(proxy).call(abi.encodeWithSelector(OptimismPortal.initialize.selector)); OptimismPortal(payable(proxy)).initialize();
} }
function test_cannotInitImpl() external { function test_cannotInitImpl() external {
vm.expectRevert("Initializable: contract is already initialized"); vm.expectRevert("Initializable: contract is already initialized");
address(opImpl).call(abi.encodeWithSelector(OptimismPortal.initialize.selector)); OptimismPortal(opImpl).initialize();
} }
function test_upgrading() external { function test_upgrading() external {
......
...@@ -18,7 +18,7 @@ contract SimpleStorage { ...@@ -18,7 +18,7 @@ contract SimpleStorage {
} }
contract Clasher { contract Clasher {
function upgradeTo(address _implementation) external view { function upgradeTo(address) external pure {
revert("upgradeTo"); revert("upgradeTo");
} }
} }
...@@ -150,8 +150,8 @@ contract Proxy_Test is Test { ...@@ -150,8 +150,8 @@ contract Proxy_Test is Test {
function test_upgradeToAndCall() external { function test_upgradeToAndCall() external {
{ {
// There should be nothing in the current proxy storage // There should be nothing in the current proxy storage
uint256 result = SimpleStorage(address(proxy)).get(1); uint256 expect = SimpleStorage(address(proxy)).get(1);
assertEq(result, 0); assertEq(expect, 0);
} }
// Deploy a new SimpleStorage // Deploy a new SimpleStorage
......
...@@ -92,12 +92,12 @@ contract ResourceMetering_Test is CommonTest { ...@@ -92,12 +92,12 @@ contract ResourceMetering_Test is CommonTest {
uint64 elasticity = uint64(uint256(meter.ELASTICITY_MULTIPLIER())); uint64 elasticity = uint64(uint256(meter.ELASTICITY_MULTIPLIER()));
meter.use(target * elasticity); meter.use(target * elasticity);
(uint128 prevBaseFee, uint64 prevBoughtGas, uint64 prevBlockNum) = meter.params(); (, uint64 prevBoughtGas, ) = meter.params();
assertEq(prevBoughtGas, target * elasticity); assertEq(prevBoughtGas, target * elasticity);
vm.roll(initialBlockNum + 1); vm.roll(initialBlockNum + 1);
meter.use(0); meter.use(0);
(uint128 postBaseFee, uint64 postBoughtGas, uint64 postBlockNum) = meter.params(); (uint128 postBaseFee,,) = meter.params();
// Base fee increases by 1/8 the difference // Base fee increases by 1/8 the difference
assertEq(postBaseFee, 1375000000); assertEq(postBaseFee, 1375000000);
} }
......
...@@ -48,8 +48,9 @@ contract SequencerFeeVault_Test is Bridge_Initializer { ...@@ -48,8 +48,9 @@ contract SequencerFeeVault_Test is Bridge_Initializer {
); );
vm.prank(alice); vm.prank(alice);
address(vault).call{ value: 100 }(hex""); (bool success,) = address(vault).call{ value: 100 }(hex"");
assertEq(success, true);
assertEq( assertEq(
address(vault).balance, address(vault).balance,
100 100
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment