Commit 7a3bd1e2 authored by ben-chain's avatar ben-chain Committed by GitHub

Remove gas estimators from gateway interface (#297)

* remove 'em

* fix overrides
parent 8f1e355e
......@@ -100,7 +100,6 @@ abstract contract Abs_L1TokenGateway is iOVM_L1TokenGateway, OVM_CrossDomainEnab
function getFinalizeDepositL2Gas()
public
view
override
returns(
uint32
)
......
......@@ -129,7 +129,6 @@ abstract contract Abs_L2DepositedToken is iOVM_L2DepositedToken, OVM_CrossDomain
public
view
virtual
override
returns(
uint32
)
......@@ -161,7 +160,14 @@ abstract contract Abs_L2DepositedToken is iOVM_L2DepositedToken, OVM_CrossDomain
* @param _to L1 adress to credit the withdrawal to
* @param _amount Amount of the token to withdraw
*/
function withdrawTo(address _to, uint _amount) external override onlyInitialized() {
function withdrawTo(
address _to,
uint _amount
)
external
override
onlyInitialized()
{
_initiateWithdrawal(_to, _amount);
}
......@@ -171,7 +177,12 @@ abstract contract Abs_L2DepositedToken is iOVM_L2DepositedToken, OVM_CrossDomain
* @param _to Account to give the withdrawal to on L1
* @param _amount Amount of the token to withdraw
*/
function _initiateWithdrawal(address _to, uint _amount) internal {
function _initiateWithdrawal(
address _to,
uint _amount
)
internal
{
// Call our withdrawal accounting handler implemented by child contracts (usually a _burn)
_handleInitiateWithdrawal(_to, _amount);
......@@ -204,7 +215,13 @@ abstract contract Abs_L2DepositedToken is iOVM_L2DepositedToken, OVM_CrossDomain
* @param _to Address to receive the withdrawal at
* @param _amount Amount of the token to withdraw
*/
function finalizeDeposit(address _to, uint _amount) external override onlyInitialized()
function finalizeDeposit(
address _to,
uint _amount
)
external
override
onlyInitialized()
onlyFromCrossDomainAccount(address(l1TokenGateway))
{
_handleFinalizeDeposit(_to, _amount);
......
......@@ -48,11 +48,4 @@ interface iOVM_L1TokenGateway {
uint _amount
)
external;
function getFinalizeDepositL2Gas()
external
view
returns(
uint32
);
}
......@@ -48,11 +48,4 @@ interface iOVM_L2DepositedToken {
uint _amount
)
external;
function getFinalizeWithdrawalL1Gas()
external
view
returns(
uint32
);
}
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