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

@0x:contracts-integrations Addressed some lingering review comments

Browse Source
This commit is contained in:
Alex Towle 2019-11-14 14:30:11 -08:00
parent 5428a19617
commit 2818e56932
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/integrations/test/framework/actors/base.ts
View File

@ -113,7 +113,7 @@ export class Actor {
await token.mintFungible.awaitTransactionSuccessAsync( await token.mintFungible.awaitTransactionSuccessAsync(
id, id,
[this.address], [this.address],
[amount || constants.INITIAL_ERC20_BALANCE], [amount || new BigNumber(constants.NUM_ERC1155_FUNGIBLE_TOKENS_MINT)],
{ from: this.address }, { from: this.address },
); );

39
contracts/integrations/test/internal-integration-tests/match_orders_test.ts
View File

@ -1,3 +1,4 @@
import { DummyERC20TokenContract } from '@0x/contracts-erc20';
import { BlockchainBalanceStore, TokenIds } from '@0x/contracts-exchange'; import { BlockchainBalanceStore, TokenIds } from '@0x/contracts-exchange';
import { ReferenceFunctions as LibReferenceFunctions } from '@0x/contracts-exchange-libs'; import { ReferenceFunctions as LibReferenceFunctions } from '@0x/contracts-exchange-libs';
import { blockchainTests, constants, expect, toBaseUnitAmount } from '@0x/contracts-test-utils'; import { blockchainTests, constants, expect, toBaseUnitAmount } from '@0x/contracts-test-utils';
@ -24,9 +25,9 @@ blockchainTests.resets('matchOrders integration tests', env => {
let makerRight: Maker; let makerRight: Maker;
// The addresses of important assets for testing. // The addresses of important assets for testing.
let makerAssetAddressLeft: string; let makerAssetLeft: DummyERC20TokenContract;
let makerAssetAddressRight: string; let makerAssetRight: DummyERC20TokenContract;
let feeAssetAddress: string; let feeAsset: DummyERC20TokenContract;
let makerAssetDataLeft: string; let makerAssetDataLeft: string;
let makerAssetDataRight: string; let makerAssetDataRight: string;
@ -44,9 +45,9 @@ blockchainTests.resets('matchOrders integration tests', env => {
numErc1155TokensToDeploy: 1, numErc1155TokensToDeploy: 1,
}); });
makerAssetAddressLeft = deployment.tokens.erc20[0].address; makerAssetLeft = deployment.tokens.erc20[0];
makerAssetAddressRight = deployment.tokens.erc20[1].address; makerAssetRight = deployment.tokens.erc20[1];
feeAssetAddress = deployment.tokens.erc20[2].address; feeAsset = deployment.tokens.erc20[2];
// Create the fee recipient actors. // Create the fee recipient actors.
feeRecipientLeft = new Actor({ feeRecipientLeft = new Actor({
@ -59,11 +60,13 @@ blockchainTests.resets('matchOrders integration tests', env => {
}); });
// Encode the asset data. // Encode the asset data.
makerAssetDataLeft = deployment.assetDataEncoder.ERC20Token.getABIEncodedTransactionData(makerAssetAddressLeft); makerAssetDataLeft = deployment.assetDataEncoder.ERC20Token.getABIEncodedTransactionData(
makerAssetDataRight = deployment.assetDataEncoder.ERC20Token.getABIEncodedTransactionData( makerAssetLeft.address,
makerAssetAddressRight,
); );
feeAssetData = deployment.assetDataEncoder.ERC20Token.getABIEncodedTransactionData(feeAssetAddress); makerAssetDataRight = deployment.assetDataEncoder.ERC20Token.getABIEncodedTransactionData(
makerAssetRight.address,
);
feeAssetData = deployment.assetDataEncoder.ERC20Token.getABIEncodedTransactionData(feeAsset.address);
// Create two market makers with compatible orders for matching. // Create two market makers with compatible orders for matching.
makerLeft = new Maker({ makerLeft = new Maker({
@ -101,11 +104,11 @@ blockchainTests.resets('matchOrders integration tests', env => {
...deployment.tokens.erc20.map(async token => makerRight.configureERC20TokenAsync(token)), ...deployment.tokens.erc20.map(async token => makerRight.configureERC20TokenAsync(token)),
makerLeft.configureERC20TokenAsync(deployment.tokens.weth, deployment.staking.stakingProxy.address), makerLeft.configureERC20TokenAsync(deployment.tokens.weth, deployment.staking.stakingProxy.address),
makerRight.configureERC20TokenAsync(deployment.tokens.weth, deployment.staking.stakingProxy.address), makerRight.configureERC20TokenAsync(deployment.tokens.weth, deployment.staking.stakingProxy.address),
matcher.configureERC20TokenAsync(deployment.tokens.erc20[2]), matcher.configureERC20TokenAsync(feeAsset),
matcher.configureERC20TokenAsync(deployment.tokens.weth, deployment.staking.stakingProxy.address), matcher.configureERC20TokenAsync(deployment.tokens.weth, deployment.staking.stakingProxy.address),
feeRecipientLeft.configureERC20TokenAsync(deployment.tokens.erc20[2]), feeRecipientLeft.configureERC20TokenAsync(feeAsset),
feeRecipientLeft.configureERC20TokenAsync(deployment.tokens.weth, deployment.staking.stakingProxy.address), feeRecipientLeft.configureERC20TokenAsync(deployment.tokens.weth, deployment.staking.stakingProxy.address),
feeRecipientRight.configureERC20TokenAsync(deployment.tokens.erc20[2]), feeRecipientRight.configureERC20TokenAsync(feeAsset),
feeRecipientRight.configureERC20TokenAsync(deployment.tokens.weth, deployment.staking.stakingProxy.address), feeRecipientRight.configureERC20TokenAsync(deployment.tokens.weth, deployment.staking.stakingProxy.address),
]); ]);
@ -149,7 +152,7 @@ blockchainTests.resets('matchOrders integration tests', env => {
rightOrder: Partial<Order>, rightOrder: Partial<Order>,
expectedTransferAmounts: Partial<MatchTransferAmounts>, expectedTransferAmounts: Partial<MatchTransferAmounts>,
withMaximalFill: boolean, withMaximalFill: boolean,
matcherAddress?: string, matcherAddress: string = matcher.address,
): Promise<void> { ): Promise<void> {
// Create orders to match. // Create orders to match.
const signedOrderLeft = await makerLeft.signOrderAsync(leftOrder); const signedOrderLeft = await makerLeft.signOrderAsync(leftOrder);
@ -1063,7 +1066,7 @@ blockchainTests.resets('matchOrders integration tests', env => {
}); });
const signedOrderRight = await makerRight.signOrderAsync({ const signedOrderRight = await makerRight.signOrderAsync({
takerAssetData: deployment.assetDataEncoder.ERC20Token.getABIEncodedTransactionData( takerAssetData: deployment.assetDataEncoder.ERC20Token.getABIEncodedTransactionData(
makerAssetAddressRight, makerAssetRight.address,
), ),
makerAssetAmount: toBaseUnitAmount(10, 18), makerAssetAmount: toBaseUnitAmount(10, 18),
takerAssetAmount: toBaseUnitAmount(2, 18), takerAssetAmount: toBaseUnitAmount(2, 18),
@ -1100,7 +1103,7 @@ blockchainTests.resets('matchOrders integration tests', env => {
// Create orders to match // Create orders to match
const signedOrderLeft = await makerLeft.signOrderAsync({ const signedOrderLeft = await makerLeft.signOrderAsync({
takerAssetData: deployment.assetDataEncoder.ERC20Token.getABIEncodedTransactionData( takerAssetData: deployment.assetDataEncoder.ERC20Token.getABIEncodedTransactionData(
makerAssetAddressLeft, makerAssetLeft.address,
), ),
makerAssetAmount: toBaseUnitAmount(5, 18), makerAssetAmount: toBaseUnitAmount(5, 18),
takerAssetAmount: toBaseUnitAmount(10, 18), takerAssetAmount: toBaseUnitAmount(10, 18),
@ -1972,7 +1975,7 @@ blockchainTests.resets('matchOrders integration tests', env => {
}); });
const signedOrderRight = await makerRight.signOrderAsync({ const signedOrderRight = await makerRight.signOrderAsync({
takerAssetData: deployment.assetDataEncoder.ERC20Token.getABIEncodedTransactionData( takerAssetData: deployment.assetDataEncoder.ERC20Token.getABIEncodedTransactionData(
makerAssetAddressRight, makerAssetRight.address,
), ),
makerAssetAmount: toBaseUnitAmount(10, 18), makerAssetAmount: toBaseUnitAmount(10, 18),
takerAssetAmount: toBaseUnitAmount(2, 18), takerAssetAmount: toBaseUnitAmount(2, 18),
@ -2007,7 +2010,7 @@ blockchainTests.resets('matchOrders integration tests', env => {
// Create orders to match // Create orders to match
const signedOrderLeft = await makerLeft.signOrderAsync({ const signedOrderLeft = await makerLeft.signOrderAsync({
takerAssetData: deployment.assetDataEncoder.ERC20Token.getABIEncodedTransactionData( takerAssetData: deployment.assetDataEncoder.ERC20Token.getABIEncodedTransactionData(
makerAssetAddressLeft, makerAssetLeft.address,
), ),
makerAssetAmount: toBaseUnitAmount(5, 18), makerAssetAmount: toBaseUnitAmount(5, 18),
takerAssetAmount: toBaseUnitAmount(10, 18), takerAssetAmount: toBaseUnitAmount(10, 18),