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

address comments

Browse Source
This commit is contained in:
Michael Zhu 2019-10-25 15:50:11 -07:00
parent 3d56c06ff3
commit 43f8101d0b
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/exchange-forwarder/package.json
View File

@ -14,7 +14,7 @@
"build:ts": "tsc -b", "build:ts": "tsc -b",
"build:ci": "yarn build", "build:ci": "yarn build",
"pre_build": "run-s compile contracts:gen generate_contract_wrappers", "pre_build": "run-s compile contracts:gen generate_contract_wrappers",
"test": "mocha --require source-map-support/register --require make-promises-safe '../integrations/lib/test/forwarder/**/*.js' --timeout 100000 --bail --exit", "test": "echo !!! Tests have been relocated to @0x/contracts-integrations !!!",
"rebuild_and_test": "run-s build test", "rebuild_and_test": "run-s build test",
"test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
"test:profiler": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html", "test:profiler": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html",

4
contracts/integrations/test/actors/base.ts
View File

@ -71,10 +71,10 @@ export class Actor {
public async configureERC721TokenAsync( public async configureERC721TokenAsync(
token: DummyERC721TokenContract, token: DummyERC721TokenContract,
spender?: string, spender?: string,
numToMint?: number, numToMint: number = 1,
): Promise<BigNumber[]> { ): Promise<BigNumber[]> {
const tokenIds: BigNumber[] = []; const tokenIds: BigNumber[] = [];
_.times(numToMint || 1, async () => { _.times(numToMint, async () => {
const tokenId = getRandomInteger(constants.ZERO_AMOUNT, constants.MAX_UINT256); const tokenId = getRandomInteger(constants.ZERO_AMOUNT, constants.MAX_UINT256);
await token.mint.awaitTransactionSuccessAsync(this.address, tokenId, { await token.mint.awaitTransactionSuccessAsync(this.address, tokenId, {
from: this.address, from: this.address,

1
contracts/integrations/test/forwarder/forwarder_test_factory.ts
View File

@ -3,7 +3,6 @@ import { ForwarderContract } from '@0x/contracts-exchange-forwarder';
import { constants, expect, getPercentageOfValue, OrderStatus } from '@0x/contracts-test-utils'; import { constants, expect, getPercentageOfValue, OrderStatus } from '@0x/contracts-test-utils';
import { OrderInfo, SignedOrder } from '@0x/types'; import { OrderInfo, SignedOrder } from '@0x/types';
import { BigNumber, RevertError } from '@0x/utils'; import { BigNumber, RevertError } from '@0x/utils';
import * as _ from 'lodash';
import { TransactionReceiptWithDecodedLogs } from 'ethereum-types'; import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
import { Actor, FeeRecipient, Maker } from '../actors'; import { Actor, FeeRecipient, Maker } from '../actors';