crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prettier and lint

Browse Source
This commit is contained in:
dextracker
2023-02-23 15:11:52 -05:00
parent 4aaba03847
commit 29b7095a00
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/zero-ex/contracts/src/features/multiplex/MultiplexFeature.sol
View File

@@ -538,8 +538,7 @@ contract MultiplexFeature is
//on the first call we want to pull tokens from the taker, subsequent calls should use the EP balance //on the first call we want to pull tokens from the taker, subsequent calls should use the EP balance
if (i == 0) { if (i == 0) {
target = msg.sender; target = msg.sender;
} } else {
else {
target = address(this); target = address(this);
} }
} else { } else {

10
contracts/zero-ex/tests/forked/MultiplexRfqt.t.sol
View File

@@ -29,9 +29,9 @@ import "src/transformers/bridges/BridgeProtocols.sol";
import "src/features/OtcOrdersFeature.sol"; import "src/features/OtcOrdersFeature.sol";
contract MultiplexRfqtTest is Test, ForkUtils, TestUtils { contract MultiplexRfqtTest is Test, ForkUtils, TestUtils {
using LibERC20TokenV06 for IERC20Token; using LibERC20TokenV06 for IERC20Token;
using LibERC20TokenV06 for IEtherToken; using LibERC20TokenV06 for IEtherToken;
function setUp() public { function setUp() public {
_setup(); _setup();
} }
@@ -67,7 +67,10 @@ contract MultiplexRfqtTest is Test, ForkUtils, TestUtils {
bytes32(0) // sushiswapPairInitCodeHash bytes32(0) // sushiswapPairInitCodeHash
); );
OtcOrdersFeature otcOrdersFeature = new OtcOrdersFeature(address(addresses.exchangeProxy), tokens.WrappedNativeToken); OtcOrdersFeature otcOrdersFeature = new OtcOrdersFeature(
address(addresses.exchangeProxy),
tokens.WrappedNativeToken
);
vm.label(address(multiplexFeature), "zeroEx/NewMultiplexFeature"); vm.label(address(multiplexFeature), "zeroEx/NewMultiplexFeature");
vm.label(address(otcOrdersFeature), "zeroEx/NewOtcOrdersFeature"); vm.label(address(otcOrdersFeature), "zeroEx/NewOtcOrdersFeature");
@@ -95,7 +98,6 @@ contract MultiplexRfqtTest is Test, ForkUtils, TestUtils {
ContractAddresses memory addresses, ContractAddresses memory addresses,
LiquiditySources memory sources LiquiditySources memory sources
) public onlyForked { ) public onlyForked {
IZERO_EX = IZeroEx(addresses.exchangeProxy); IZERO_EX = IZeroEx(addresses.exchangeProxy);
address[] memory tradeTokens = new address[](3); address[] memory tradeTokens = new address[](3);
@@ -193,8 +195,6 @@ contract MultiplexRfqtTest is Test, ForkUtils, TestUtils {
vm.startPrank(order.maker); vm.startPrank(order.maker);
IERC20Token(order.makerToken).approveIfBelow(addresses.exchangeProxy, 2e20); IERC20Token(order.makerToken).approveIfBelow(addresses.exchangeProxy, 2e20);
order.taker = address(0); order.taker = address(0);
order.txOrigin = address(tx.origin); order.txOrigin = address(tx.origin);
order.expiryAndNonce = encodeExpiryAndNonce(order.maker, bump); order.expiryAndNonce = encodeExpiryAndNonce(order.maker, bump);