fix: Changes after rebase
This commit is contained in:
committed by
Diana Carvalho
parent
af68016223
commit
d5d6e37041
@@ -20,9 +20,12 @@ contract UniswapV2Executor is IExecutor, TokenTransfer {
|
|||||||
address private immutable self;
|
address private immutable self;
|
||||||
uint256 public immutable feeBps;
|
uint256 public immutable feeBps;
|
||||||
|
|
||||||
constructor(address _factory, bytes32 _initCode, address _permit2, uint256 _feeBps)
|
constructor(
|
||||||
TokenTransfer(_permit2)
|
address _factory,
|
||||||
{
|
bytes32 _initCode,
|
||||||
|
address _permit2,
|
||||||
|
uint256 _feeBps
|
||||||
|
) TokenTransfer(_permit2) {
|
||||||
if (_factory == address(0)) {
|
if (_factory == address(0)) {
|
||||||
revert UniswapV2Executor__InvalidFactory();
|
revert UniswapV2Executor__InvalidFactory();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,9 +8,12 @@ import {Constants} from "../Constants.sol";
|
|||||||
import {Permit2TestHelper} from "../Permit2TestHelper.sol";
|
import {Permit2TestHelper} from "../Permit2TestHelper.sol";
|
||||||
|
|
||||||
contract UniswapV2ExecutorExposed is UniswapV2Executor {
|
contract UniswapV2ExecutorExposed is UniswapV2Executor {
|
||||||
constructor(address _factory, bytes32 _initCode, address _permit2, uint256 _feeBps)
|
constructor(
|
||||||
UniswapV2Executor(_factory, _initCode, _permit2, _feeBps)
|
address _factory,
|
||||||
{}
|
bytes32 _initCode,
|
||||||
|
address _permit2,
|
||||||
|
uint256 _feeBps
|
||||||
|
) UniswapV2Executor(_factory, _initCode, _permit2, _feeBps) {}
|
||||||
|
|
||||||
function decodeParams(bytes calldata data)
|
function decodeParams(bytes calldata data)
|
||||||
external
|
external
|
||||||
@@ -69,13 +72,13 @@ contract UniswapV2ExecutorTest is Test, Constants, Permit2TestHelper {
|
|||||||
SUSHISWAPV2_FACTORY_ETHEREUM,
|
SUSHISWAPV2_FACTORY_ETHEREUM,
|
||||||
SUSHIV2_POOL_CODE_INIT_HASH,
|
SUSHIV2_POOL_CODE_INIT_HASH,
|
||||||
PERMIT2_ADDRESS,
|
PERMIT2_ADDRESS,
|
||||||
30
|
30
|
||||||
);
|
);
|
||||||
pancakeswapV2Exposed = new UniswapV2ExecutorExposed(
|
pancakeswapV2Exposed = new UniswapV2ExecutorExposed(
|
||||||
PANCAKESWAPV2_FACTORY_ETHEREUM,
|
PANCAKESWAPV2_FACTORY_ETHEREUM,
|
||||||
PANCAKEV2_POOL_CODE_INIT_HASH,
|
PANCAKEV2_POOL_CODE_INIT_HASH,
|
||||||
PERMIT2_ADDRESS,
|
PERMIT2_ADDRESS,
|
||||||
25
|
25
|
||||||
);
|
);
|
||||||
permit2 = IAllowanceTransfer(PERMIT2_ADDRESS);
|
permit2 = IAllowanceTransfer(PERMIT2_ADDRESS);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user