Commit 4f7f0ac8 authored by Kelvin Fichter's avatar Kelvin Fichter

fix(ctb): remove unnecessary ERC20 factory code

Removes a legacy getter that was mistakenly added to the ERC20 factory.
We never had a getter for the bridge variable.
parent ab8cf2ea
...@@ -84,7 +84,7 @@ func TestBuildL1DeveloperGenesis(t *testing.T) { ...@@ -84,7 +84,7 @@ func TestBuildL1DeveloperGenesis(t *testing.T) {
factory, err := bindings.NewOptimismMintableERC20(predeploys.DevOptimismMintableERC20FactoryAddr, sim) factory, err := bindings.NewOptimismMintableERC20(predeploys.DevOptimismMintableERC20FactoryAddr, sim)
require.NoError(t, err) require.NoError(t, err)
bridgeAddr, err := factory.Bridge(callOpts) bridgeAddr, err := factory.BRIDGE(callOpts)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, predeploys.DevL1StandardBridgeAddr, bridgeAddr) require.Equal(t, predeploys.DevL1StandardBridgeAddr, bridgeAddr)
......
...@@ -226,10 +226,10 @@ OptimismMintableERC20_Test:test_legacy_succeeds() (gas: 14344) ...@@ -226,10 +226,10 @@ OptimismMintableERC20_Test:test_legacy_succeeds() (gas: 14344)
OptimismMintableERC20_Test:test_mint_notBridge_reverts() (gas: 11121) OptimismMintableERC20_Test:test_mint_notBridge_reverts() (gas: 11121)
OptimismMintableERC20_Test:test_mint_succeeds() (gas: 63609) OptimismMintableERC20_Test:test_mint_succeeds() (gas: 63609)
OptimismMintableERC20_Test:test_remoteToken_succeeds() (gas: 7622) OptimismMintableERC20_Test:test_remoteToken_succeeds() (gas: 7622)
OptimismMintableTokenFactory_Test:test_bridge_succeeds() (gas: 7577) OptimismMintableTokenFactory_Test:test_bridge_succeeds() (gas: 7602)
OptimismMintableTokenFactory_Test:test_createStandardL2Token_remoteIsZero_succeeds() (gas: 9413) OptimismMintableTokenFactory_Test:test_createStandardL2Token_remoteIsZero_succeeds() (gas: 9390)
OptimismMintableTokenFactory_Test:test_createStandardL2Token_sameTwice_succeeds() (gas: 2176713) OptimismMintableTokenFactory_Test:test_createStandardL2Token_sameTwice_succeeds() (gas: 2176667)
OptimismMintableTokenFactory_Test:test_createStandardL2Token_succeeds() (gas: 1095296) OptimismMintableTokenFactory_Test:test_createStandardL2Token_succeeds() (gas: 1095273)
OptimismMintableERC721_Test:test_burn_notBridge_reverts() (gas: 136922) OptimismMintableERC721_Test:test_burn_notBridge_reverts() (gas: 136922)
OptimismMintableERC721_Test:test_burn_succeeds() (gas: 118779) OptimismMintableERC721_Test:test_burn_succeeds() (gas: 118779)
OptimismMintableERC721_Test:test_constructor_succeeds() (gas: 24162) OptimismMintableERC721_Test:test_constructor_succeeds() (gas: 24162)
......
...@@ -17,7 +17,7 @@ contract OptimismMintableTokenFactory_Test is Bridge_Initializer { ...@@ -17,7 +17,7 @@ contract OptimismMintableTokenFactory_Test is Bridge_Initializer {
} }
function test_bridge_succeeds() external { function test_bridge_succeeds() external {
assertEq(address(L2TokenFactory.bridge()), address(L2Bridge)); assertEq(address(L2TokenFactory.BRIDGE()), address(L2Bridge));
} }
function test_createStandardL2Token_succeeds() external { function test_createStandardL2Token_succeeds() external {
......
...@@ -50,16 +50,6 @@ contract OptimismMintableERC20Factory is Semver { ...@@ -50,16 +50,6 @@ contract OptimismMintableERC20Factory is Semver {
BRIDGE = _bridge; BRIDGE = _bridge;
} }
/**
* @custom:legacy
* @notice Legacy getter for StandardBridge address.
*
* @return Address of the StandardBridge on this chain.
*/
function bridge() external view returns (address) {
return BRIDGE;
}
/** /**
* @custom:legacy * @custom:legacy
* @notice Creates an instance of the OptimismMintableERC20 contract. Legacy version of the * @notice Creates an instance of the OptimismMintableERC20 contract. Legacy version of the
......
...@@ -264,7 +264,7 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -264,7 +264,7 @@ const deployFn: DeployFunction = async (hre) => {
// Check OptimismMintableERC20Factory was initialized properly. // Check OptimismMintableERC20Factory was initialized properly.
await assertContractVariable( await assertContractVariable(
OptimismMintableERC20Factory, OptimismMintableERC20Factory,
'bridge', 'BRIDGE',
L1StandardBridge.address L1StandardBridge.address
) )
......
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