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

Fix build and linting errors

Browse Source
This commit is contained in:
Amir Bandeali 2019-09-02 11:41:13 -07:00
parent e880447714
commit b3b0496c49
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/dev-utils/test/lib_transaction_decoder.ts
View File

@ -56,7 +56,7 @@ describe('LibTransactionDecoder', () => {
]); ]);
}); });
for (const func of ['batchFillOrders', 'batchFillOrdersNoThrow', 'batchFillOrKillOrders']) { for (const func of ['batchFillOrdersNoThrow', 'batchFillOrKillOrders']) {
const input = (exchangeInterface as any)[func].getABIEncodedTransactionData( const input = (exchangeInterface as any)[func].getABIEncodedTransactionData(
[order, order], [order, order],
[takerAssetFillAmount, takerAssetFillAmount], [takerAssetFillAmount, takerAssetFillAmount],
@ -82,7 +82,7 @@ describe('LibTransactionDecoder', () => {
]); ]);
}); });
for (const func of ['fillOrder', 'fillOrderNoThrow', 'fillOrKillOrder']) { for (const func of ['fillOrder', 'fillOrKillOrder']) {
const input = (exchangeInterface as any)[func].getABIEncodedTransactionData( const input = (exchangeInterface as any)[func].getABIEncodedTransactionData(
order, order,
takerAssetFillAmount, takerAssetFillAmount,

2
contracts/exchange/compiler.json
View File

@ -7,7 +7,7 @@
"evmVersion": "constantinople", "evmVersion": "constantinople",
"optimizer": { "optimizer": {
"enabled": true, "enabled": true,
"runs": 10000000, "runs": 1000000,
"details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true } "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
}, },
"outputSelection": { "outputSelection": {

11
contracts/exchange/test/wrapper.ts
View File

@ -1,6 +1,5 @@
import { ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper } from '@0x/contracts-asset-proxy'; import { ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper } from '@0x/contracts-asset-proxy';
import { DummyERC20TokenContract } from '@0x/contracts-erc20'; import { DummyERC20TokenContract } from '@0x/contracts-erc20';
import { DummyERC721TokenContract } from '@0x/contracts-erc721';
import { import {
blockchainTests, blockchainTests,
constants, constants,
@ -8,7 +7,6 @@ import {
ERC20BalancesByOwner, ERC20BalancesByOwner,
expect, expect,
getLatestBlockTimestampAsync, getLatestBlockTimestampAsync,
increaseTimeAndMineBlockAsync,
OrderFactory, OrderFactory,
} from '@0x/contracts-test-utils'; } from '@0x/contracts-test-utils';
import { assetDataUtils, ExchangeRevertErrors, orderHashUtils } from '@0x/order-utils'; import { assetDataUtils, ExchangeRevertErrors, orderHashUtils } from '@0x/order-utils';
@ -30,7 +28,6 @@ blockchainTests.resets('Exchange wrappers', env => {
let erc20TokenA: DummyERC20TokenContract; let erc20TokenA: DummyERC20TokenContract;
let erc20TokenB: DummyERC20TokenContract; let erc20TokenB: DummyERC20TokenContract;
let feeToken: DummyERC20TokenContract; let feeToken: DummyERC20TokenContract;
let erc721Token: DummyERC721TokenContract;
let exchange: ExchangeContract; let exchange: ExchangeContract;
let erc20Proxy: ERC20ProxyContract; let erc20Proxy: ERC20ProxyContract;
let erc721Proxy: ERC721ProxyContract; let erc721Proxy: ERC721ProxyContract;
@ -41,14 +38,10 @@ blockchainTests.resets('Exchange wrappers', env => {
let erc20Balances: ERC20BalancesByOwner; let erc20Balances: ERC20BalancesByOwner;
let orderFactory: OrderFactory; let orderFactory: OrderFactory;
let erc721MakerAssetId: BigNumber;
let erc721TakerAssetId: BigNumber;
let defaultMakerAssetAddress: string; let defaultMakerAssetAddress: string;
let defaultTakerAssetAddress: string; let defaultTakerAssetAddress: string;
let defaultFeeAssetAddress: string; let defaultFeeAssetAddress: string;
const DEFAULT_GAS_PRICE = new BigNumber(2);
const PROTOCOL_FEE_MULTIPLIER = new BigNumber(150); const PROTOCOL_FEE_MULTIPLIER = new BigNumber(150);
const nullFillResults: FillResults = { const nullFillResults: FillResults = {
@ -75,12 +68,8 @@ blockchainTests.resets('Exchange wrappers', env => {
erc20Proxy = await erc20Wrapper.deployProxyAsync(); erc20Proxy = await erc20Wrapper.deployProxyAsync();
await erc20Wrapper.setBalancesAndAllowancesAsync(); await erc20Wrapper.setBalancesAndAllowancesAsync();
[erc721Token] = await erc721Wrapper.deployDummyTokensAsync();
erc721Proxy = await erc721Wrapper.deployProxyAsync(); erc721Proxy = await erc721Wrapper.deployProxyAsync();
await erc721Wrapper.setBalancesAndAllowancesAsync(); await erc721Wrapper.setBalancesAndAllowancesAsync();
const erc721Balances = await erc721Wrapper.getBalancesAsync();
erc721MakerAssetId = erc721Balances[makerAddress][erc721Token.address][0];
erc721TakerAssetId = erc721Balances[takerAddress][erc721Token.address][0];
exchange = await ExchangeContract.deployFrom0xArtifactAsync( exchange = await ExchangeContract.deployFrom0xArtifactAsync(
artifacts.Exchange, artifacts.Exchange,

3
contracts/test-utils/package.json
View File

@ -68,8 +68,7 @@
"ethers": "~4.0.4", "ethers": "~4.0.4",
"js-combinatorics": "^0.5.3", "js-combinatorics": "^0.5.3",
"lodash": "^4.17.11", "lodash": "^4.17.11",
"make-promises-safe": "^1.1.0", "make-promises-safe": "^1.1.0"
"mocha": "^4.1.0"
}, },
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"