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

Move LibAssetDataTransfer and MixinWeth(Utils) to contracts-extensions

Browse Source
This commit is contained in:
Michael Zhu
2020-01-31 14:57:32 -08:00
parent a2fcab47d4
commit 329719472a
65 changed files with 565 additions and 4826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contracts/integrations/package.json
View File

@@ -59,6 +59,7 @@
"@0x/contracts-dev-utils": "^1.0.5",
"@0x/contracts-exchange-forwarder": "^4.0.5",
"@0x/contracts-exchange-libs": "^4.1.1",
"@0x/contracts-extensions": "^5.1.4",
"@0x/contracts-gen": "^2.0.5",
"@0x/contracts-utils": "^4.2.0",
"@0x/coordinator-server": "^1.0.5",

7
contracts/integrations/test/forwarder/forwarder_test.ts
View File

@@ -3,6 +3,7 @@ import { DummyERC20TokenContract } from '@0x/contracts-erc20';
import { DummyERC721TokenContract } from '@0x/contracts-erc721';
import { artifacts as exchangeArtifacts, ExchangeContract } from '@0x/contracts-exchange';
import { artifacts, ExchangeForwarderRevertErrors, ForwarderContract } from '@0x/contracts-exchange-forwarder';
import { MixinWethUtilsRevertErrors } from '@0x/contracts-extensions';
import {
blockchainTests,
constants,
@@ -426,7 +427,7 @@ blockchainTests('Forwarder integration tests', env => {
});
const forwarderFeeAmounts = [toBaseUnitAmount(0.2)];
const forwarderFeeRecipientAddresses: string[] = [];
const revertError = new ExchangeForwarderRevertErrors.EthFeeLengthMismatchError(
const revertError = new MixinWethUtilsRevertErrors.EthFeeLengthMismatchError(
new BigNumber(forwarderFeeAmounts.length),
new BigNumber(forwarderFeeRecipientAddresses.length),
);
@@ -443,7 +444,7 @@ blockchainTests('Forwarder integration tests', env => {
});
const forwarderFeeAmounts: BigNumber[] = [];
const forwarderFeeRecipientAddresses = [randomAddress()];
const revertError = new ExchangeForwarderRevertErrors.EthFeeLengthMismatchError(
const revertError = new MixinWethUtilsRevertErrors.EthFeeLengthMismatchError(
new BigNumber(forwarderFeeAmounts.length),
new BigNumber(forwarderFeeRecipientAddresses.length),
);
@@ -768,7 +769,7 @@ blockchainTests('Forwarder integration tests', env => {
const order = await maker.signOrderAsync();
const forwarderFeeAmounts = [toBaseUnitAmount(1)];
const value = forwarderFeeAmounts[0].minus(1);
const revertError = new ExchangeForwarderRevertErrors.InsufficientEthForFeeError(
const revertError = new MixinWethUtilsRevertErrors.InsufficientEthForFeeError(
forwarderFeeAmounts[0],
value,
);