Commit c627cc85 authored by elenadimitrova's avatar elenadimitrova Committed by Kelvin Fichter

Rename iOVM_L2ERC20Bridge.sol to IL2ERC20Bridge

parent 858b3dfc
...@@ -6,7 +6,7 @@ pragma experimental ABIEncoderV2; ...@@ -6,7 +6,7 @@ pragma experimental ABIEncoderV2;
/* Interface Imports */ /* Interface Imports */
import { IL1StandardBridge } from "./IL1StandardBridge.sol"; import { IL1StandardBridge } from "./IL1StandardBridge.sol";
import { IL1ERC20Bridge } from "./IL1ERC20Bridge.sol"; import { IL1ERC20Bridge } from "./IL1ERC20Bridge.sol";
import { iOVM_L2ERC20Bridge } from "../../L2/messaging/iOVM_L2ERC20Bridge.sol"; import { IL2ERC20Bridge } from "../../L2/messaging/IL2ERC20Bridge.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
/* Library Imports */ /* Library Imports */
...@@ -158,7 +158,7 @@ contract L1StandardBridge is IL1StandardBridge, OVM_CrossDomainEnabled { ...@@ -158,7 +158,7 @@ contract L1StandardBridge is IL1StandardBridge, OVM_CrossDomainEnabled {
// Construct calldata for finalizeDeposit call // Construct calldata for finalizeDeposit call
bytes memory message = bytes memory message =
abi.encodeWithSelector( abi.encodeWithSelector(
iOVM_L2ERC20Bridge.finalizeDeposit.selector, IL2ERC20Bridge.finalizeDeposit.selector,
address(0), address(0),
Lib_PredeployAddresses.OVM_ETH, Lib_PredeployAddresses.OVM_ETH,
_from, _from,
...@@ -249,7 +249,7 @@ contract L1StandardBridge is IL1StandardBridge, OVM_CrossDomainEnabled { ...@@ -249,7 +249,7 @@ contract L1StandardBridge is IL1StandardBridge, OVM_CrossDomainEnabled {
// Construct calldata for _l2Token.finalizeDeposit(_to, _amount) // Construct calldata for _l2Token.finalizeDeposit(_to, _amount)
bytes memory message = abi.encodeWithSelector( bytes memory message = abi.encodeWithSelector(
iOVM_L2ERC20Bridge.finalizeDeposit.selector, IL2ERC20Bridge.finalizeDeposit.selector,
_l1Token, _l1Token,
_l2Token, _l2Token,
_from, _from,
......
...@@ -3,9 +3,9 @@ pragma solidity >0.5.0; ...@@ -3,9 +3,9 @@ pragma solidity >0.5.0;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
/** /**
* @title iOVM_L2ERC20Bridge * @title IL2ERC20Bridge
*/ */
interface iOVM_L2ERC20Bridge { interface IL2ERC20Bridge {
/********** /**********
* Events * * Events *
......
...@@ -5,7 +5,7 @@ pragma experimental ABIEncoderV2; ...@@ -5,7 +5,7 @@ pragma experimental ABIEncoderV2;
/* Interface Imports */ /* Interface Imports */
import { IL1StandardBridge } from "../../L1/messaging/IL1StandardBridge.sol"; import { IL1StandardBridge } from "../../L1/messaging/IL1StandardBridge.sol";
import { IL1ERC20Bridge } from "../../L1/messaging/IL1ERC20Bridge.sol"; import { IL1ERC20Bridge } from "../../L1/messaging/IL1ERC20Bridge.sol";
import { iOVM_L2ERC20Bridge } from "./iOVM_L2ERC20Bridge.sol"; import { IL2ERC20Bridge } from "./IL2ERC20Bridge.sol";
/* Library Imports */ /* Library Imports */
import { ERC165Checker } from "@openzeppelin/contracts/introspection/ERC165Checker.sol"; import { ERC165Checker } from "@openzeppelin/contracts/introspection/ERC165Checker.sol";
...@@ -26,7 +26,7 @@ import { IL2StandardERC20 } from "../../libraries/standards/IL2StandardERC20.sol ...@@ -26,7 +26,7 @@ import { IL2StandardERC20 } from "../../libraries/standards/IL2StandardERC20.sol
* *
* Runtime target: OVM * Runtime target: OVM
*/ */
contract OVM_L2StandardBridge is iOVM_L2ERC20Bridge, OVM_CrossDomainEnabled { contract OVM_L2StandardBridge is IL2ERC20Bridge, OVM_CrossDomainEnabled {
/******************************** /********************************
* External Contract References * * External Contract References *
...@@ -56,7 +56,7 @@ contract OVM_L2StandardBridge is iOVM_L2ERC20Bridge, OVM_CrossDomainEnabled { ...@@ -56,7 +56,7 @@ contract OVM_L2StandardBridge is iOVM_L2ERC20Bridge, OVM_CrossDomainEnabled {
***************/ ***************/
/** /**
* @inheritdoc iOVM_L2ERC20Bridge * @inheritdoc IL2ERC20Bridge
*/ */
function withdraw( function withdraw(
address _l2Token, address _l2Token,
...@@ -79,7 +79,7 @@ contract OVM_L2StandardBridge is iOVM_L2ERC20Bridge, OVM_CrossDomainEnabled { ...@@ -79,7 +79,7 @@ contract OVM_L2StandardBridge is iOVM_L2ERC20Bridge, OVM_CrossDomainEnabled {
} }
/** /**
* @inheritdoc iOVM_L2ERC20Bridge * @inheritdoc IL2ERC20Bridge
*/ */
function withdrawTo( function withdrawTo(
address _l2Token, address _l2Token,
...@@ -167,7 +167,7 @@ contract OVM_L2StandardBridge is iOVM_L2ERC20Bridge, OVM_CrossDomainEnabled { ...@@ -167,7 +167,7 @@ contract OVM_L2StandardBridge is iOVM_L2ERC20Bridge, OVM_CrossDomainEnabled {
************************************/ ************************************/
/** /**
* @inheritdoc iOVM_L2ERC20Bridge * @inheritdoc IL2ERC20Bridge
*/ */
function finalizeDeposit( function finalizeDeposit(
address _l1Token, address _l1Token,
......
...@@ -45,7 +45,7 @@ describe('L1StandardBridge', () => { ...@@ -45,7 +45,7 @@ describe('L1StandardBridge', () => {
) )
// get an L2ER20Bridge Interface // get an L2ER20Bridge Interface
IL2ERC20Bridge = getContractInterface('iOVM_L2ERC20Bridge') IL2ERC20Bridge = getContractInterface('IL2ERC20Bridge')
aliceAddress = await alice.getAddress() aliceAddress = await alice.getAddress()
bobsAddress = await bob.getAddress() bobsAddress = await bob.getAddress()
......
...@@ -44,7 +44,7 @@ describe('OVM_L2StandardBridge', () => { ...@@ -44,7 +44,7 @@ describe('OVM_L2StandardBridge', () => {
) )
// get an L2ER20Bridge Interface // get an L2ER20Bridge Interface
IL2ERC20Bridge = getContractInterface('iOVM_L2ERC20Bridge') IL2ERC20Bridge = getContractInterface('IL2ERC20Bridge')
}) })
let OVM_L2StandardBridge: Contract let OVM_L2StandardBridge: Contract
......
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