aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange
diff options
context:
space:
mode:
Diffstat (limited to 'packages/contracts/test/exchange')
-rw-r--r--packages/contracts/test/exchange/core.ts48
-rw-r--r--packages/contracts/test/exchange/dispatcher.ts10
-rw-r--r--packages/contracts/test/exchange/match_orders.ts12
-rw-r--r--packages/contracts/test/exchange/signature_validator.ts10
-rw-r--r--packages/contracts/test/exchange/transactions.ts16
-rw-r--r--packages/contracts/test/exchange/wrapper.ts12
6 files changed, 54 insertions, 54 deletions
diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts
index c83041638..59756fe9a 100644
--- a/packages/contracts/test/exchange/core.ts
+++ b/packages/contracts/test/exchange/core.ts
@@ -1,6 +1,6 @@
import { BlockchainLifecycle } from '@0xproject/dev-utils';
import { assetProxyUtils, orderHashUtils } from '@0xproject/order-utils';
-import { AssetProxyId, RevertReasons, SignedOrder } from '@0xproject/types';
+import { AssetProxyId, RevertReason, SignedOrder } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as chai from 'chai';
@@ -420,7 +420,7 @@ describe('Exchange core', () => {
});
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress),
- RevertReasons.InvalidTaker,
+ RevertReason.InvalidTaker,
);
});
@@ -438,7 +438,7 @@ describe('Exchange core', () => {
signedOrder.signature = invalidSigHex;
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress),
- RevertReasons.InvalidOrderSignature,
+ RevertReason.InvalidOrderSignature,
);
});
@@ -449,7 +449,7 @@ describe('Exchange core', () => {
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress),
- RevertReasons.OrderUnfillable,
+ RevertReason.OrderUnfillable,
);
});
@@ -460,7 +460,7 @@ describe('Exchange core', () => {
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress),
- RevertReasons.OrderUnfillable,
+ RevertReason.OrderUnfillable,
);
});
@@ -471,7 +471,7 @@ describe('Exchange core', () => {
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress, {
takerAssetFillAmount: new BigNumber(0),
}),
- RevertReasons.InvalidTakerAmount,
+ RevertReason.InvalidTakerAmount,
);
});
@@ -482,7 +482,7 @@ describe('Exchange core', () => {
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress),
- RevertReasons.TransferFailed,
+ RevertReason.TransferFailed,
);
});
@@ -492,7 +492,7 @@ describe('Exchange core', () => {
});
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress),
- RevertReasons.TransferFailed,
+ RevertReason.TransferFailed,
);
});
@@ -505,7 +505,7 @@ describe('Exchange core', () => {
);
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress),
- RevertReasons.TransferFailed,
+ RevertReason.TransferFailed,
);
});
@@ -518,7 +518,7 @@ describe('Exchange core', () => {
);
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress),
- RevertReasons.TransferFailed,
+ RevertReason.TransferFailed,
);
});
@@ -528,7 +528,7 @@ describe('Exchange core', () => {
});
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress),
- RevertReasons.OrderUnfillable,
+ RevertReason.OrderUnfillable,
);
});
@@ -537,7 +537,7 @@ describe('Exchange core', () => {
await exchangeWrapper.fillOrderAsync(signedOrder, takerAddress);
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress),
- RevertReasons.OrderUnfillable,
+ RevertReason.OrderUnfillable,
);
});
});
@@ -551,7 +551,7 @@ describe('Exchange core', () => {
it('should throw if not sent by maker', async () => {
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.cancelOrderAsync(signedOrder, takerAddress),
- RevertReasons.InvalidMaker,
+ RevertReason.InvalidMaker,
);
});
@@ -562,7 +562,7 @@ describe('Exchange core', () => {
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.cancelOrderAsync(signedOrder, makerAddress),
- RevertReasons.OrderUnfillable,
+ RevertReason.OrderUnfillable,
);
});
@@ -573,7 +573,7 @@ describe('Exchange core', () => {
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.cancelOrderAsync(signedOrder, makerAddress),
- RevertReasons.OrderUnfillable,
+ RevertReason.OrderUnfillable,
);
});
@@ -583,7 +583,7 @@ describe('Exchange core', () => {
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress, {
takerAssetFillAmount: signedOrder.takerAssetAmount.div(2),
}),
- RevertReasons.OrderUnfillable,
+ RevertReason.OrderUnfillable,
);
});
@@ -606,7 +606,7 @@ describe('Exchange core', () => {
await exchangeWrapper.cancelOrderAsync(signedOrder, makerAddress);
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.cancelOrderAsync(signedOrder, makerAddress),
- RevertReasons.OrderUnfillable,
+ RevertReason.OrderUnfillable,
);
});
@@ -616,7 +616,7 @@ describe('Exchange core', () => {
});
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.cancelOrderAsync(signedOrder, makerAddress),
- RevertReasons.OrderUnfillable,
+ RevertReason.OrderUnfillable,
);
});
@@ -636,7 +636,7 @@ describe('Exchange core', () => {
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress, {
takerAssetFillAmount: fillTakerAssetAmount2,
}),
- RevertReasons.RoundingError,
+ RevertReason.RoundingError,
);
});
});
@@ -648,7 +648,7 @@ describe('Exchange core', () => {
const lesserOrderEpoch = new BigNumber(0);
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.cancelOrdersUpToAsync(lesserOrderEpoch, makerAddress),
- RevertReasons.InvalidNewOrderEpoch,
+ RevertReason.InvalidNewOrderEpoch,
);
});
@@ -657,7 +657,7 @@ describe('Exchange core', () => {
await exchangeWrapper.cancelOrdersUpToAsync(orderEpoch, makerAddress);
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.cancelOrdersUpToAsync(orderEpoch, makerAddress),
- RevertReasons.InvalidNewOrderEpoch,
+ RevertReason.InvalidNewOrderEpoch,
);
});
@@ -817,7 +817,7 @@ describe('Exchange core', () => {
const takerAssetFillAmount = signedOrder.takerAssetAmount;
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress, { takerAssetFillAmount }),
- RevertReasons.InvalidAmount,
+ RevertReason.InvalidAmount,
);
});
@@ -840,7 +840,7 @@ describe('Exchange core', () => {
const takerAssetFillAmount = signedOrder.takerAssetAmount;
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress, { takerAssetFillAmount }),
- RevertReasons.InvalidAmount,
+ RevertReason.InvalidAmount,
);
});
@@ -857,7 +857,7 @@ describe('Exchange core', () => {
const takerAssetFillAmount = signedOrder.takerAssetAmount.div(2);
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress, { takerAssetFillAmount }),
- RevertReasons.RoundingError,
+ RevertReason.RoundingError,
);
});
diff --git a/packages/contracts/test/exchange/dispatcher.ts b/packages/contracts/test/exchange/dispatcher.ts
index 495f6d3c8..8adbee6a3 100644
--- a/packages/contracts/test/exchange/dispatcher.ts
+++ b/packages/contracts/test/exchange/dispatcher.ts
@@ -1,6 +1,6 @@
import { BlockchainLifecycle } from '@0xproject/dev-utils';
import { assetProxyUtils } from '@0xproject/order-utils';
-import { AssetProxyId, RevertReasons } from '@0xproject/types';
+import { AssetProxyId, RevertReason } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
@@ -182,7 +182,7 @@ describe('AssetProxyDispatcher', () => {
constants.NULL_ADDRESS,
{ from: owner },
),
- RevertReasons.AssetProxyMismatch,
+ RevertReason.AssetProxyMismatch,
);
});
@@ -224,7 +224,7 @@ describe('AssetProxyDispatcher', () => {
prevProxyAddress,
{ from: notOwner },
),
- RevertReasons.OnlyContractOwner,
+ RevertReason.OnlyContractOwner,
);
});
@@ -237,7 +237,7 @@ describe('AssetProxyDispatcher', () => {
prevProxyAddress,
{ from: owner },
),
- RevertReasons.AssetProxyIdMismatch,
+ RevertReason.AssetProxyIdMismatch,
);
});
});
@@ -316,7 +316,7 @@ describe('AssetProxyDispatcher', () => {
amount,
{ from: owner },
),
- RevertReasons.AssetProxyDoesNotExist,
+ RevertReason.AssetProxyDoesNotExist,
);
});
});
diff --git a/packages/contracts/test/exchange/match_orders.ts b/packages/contracts/test/exchange/match_orders.ts
index 6f4feb8b7..bcf691471 100644
--- a/packages/contracts/test/exchange/match_orders.ts
+++ b/packages/contracts/test/exchange/match_orders.ts
@@ -1,6 +1,6 @@
import { BlockchainLifecycle } from '@0xproject/dev-utils';
import { assetProxyUtils } from '@0xproject/order-utils';
-import { AssetProxyId, RevertReasons } from '@0xproject/types';
+import { AssetProxyId, RevertReason } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as chai from 'chai';
@@ -600,7 +600,7 @@ describe('matchOrders', () => {
// Match orders
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.matchOrdersAsync(signedOrderLeft, signedOrderRight, takerAddress),
- RevertReasons.OrderUnfillable,
+ RevertReason.OrderUnfillable,
);
});
@@ -625,7 +625,7 @@ describe('matchOrders', () => {
// Match orders
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.matchOrdersAsync(signedOrderLeft, signedOrderRight, takerAddress),
- RevertReasons.OrderUnfillable,
+ RevertReason.OrderUnfillable,
);
});
@@ -654,7 +654,7 @@ describe('matchOrders', () => {
erc20BalancesByOwner,
erc721TokenIdsByOwner,
),
- RevertReasons.NegativeSpreadRequired,
+ RevertReason.NegativeSpreadRequired,
);
});
@@ -687,7 +687,7 @@ describe('matchOrders', () => {
// reverse of the left order, rather than checking equality. This
// saves a bunch of gas, but as a result if the assetData fields are
// off then the failure ends up happening at signature validation
- RevertReasons.InvalidOrderSignature,
+ RevertReason.InvalidOrderSignature,
);
});
@@ -718,7 +718,7 @@ describe('matchOrders', () => {
erc20BalancesByOwner,
erc721TokenIdsByOwner,
),
- RevertReasons.InvalidOrderSignature,
+ RevertReason.InvalidOrderSignature,
);
});
diff --git a/packages/contracts/test/exchange/signature_validator.ts b/packages/contracts/test/exchange/signature_validator.ts
index c610ead61..21cc343b3 100644
--- a/packages/contracts/test/exchange/signature_validator.ts
+++ b/packages/contracts/test/exchange/signature_validator.ts
@@ -1,6 +1,6 @@
import { BlockchainLifecycle } from '@0xproject/dev-utils';
import { addSignedMessagePrefix, assetProxyUtils, MessagePrefixType, orderHashUtils } from '@0xproject/order-utils';
-import { RevertReasons, SignatureType, SignedOrder } from '@0xproject/types';
+import { RevertReason, SignatureType, SignedOrder } from '@0xproject/types';
import * as chai from 'chai';
import { LogWithDecodedArgs } from 'ethereum-types';
import ethUtil = require('ethereumjs-util');
@@ -107,7 +107,7 @@ describe('MixinSignatureValidator', () => {
signedOrder.makerAddress,
emptySignature,
),
- RevertReasons.LengthGreaterThan0Required,
+ RevertReason.LengthGreaterThan0Required,
);
});
@@ -121,7 +121,7 @@ describe('MixinSignatureValidator', () => {
signedOrder.makerAddress,
unsupportedSignatureHex,
),
- RevertReasons.SignatureUnsupported,
+ RevertReason.SignatureUnsupported,
);
});
@@ -134,7 +134,7 @@ describe('MixinSignatureValidator', () => {
signedOrder.makerAddress,
unsupportedSignatureHex,
),
- RevertReasons.SignatureIllegal,
+ RevertReason.SignatureIllegal,
);
});
@@ -161,7 +161,7 @@ describe('MixinSignatureValidator', () => {
signedOrder.makerAddress,
signatureHex,
),
- RevertReasons.Length0Required,
+ RevertReason.Length0Required,
);
});
diff --git a/packages/contracts/test/exchange/transactions.ts b/packages/contracts/test/exchange/transactions.ts
index 44ed98c53..b0c08e46e 100644
--- a/packages/contracts/test/exchange/transactions.ts
+++ b/packages/contracts/test/exchange/transactions.ts
@@ -1,6 +1,6 @@
import { BlockchainLifecycle } from '@0xproject/dev-utils';
import { assetProxyUtils, generatePseudoRandomSalt } from '@0xproject/order-utils';
-import { AssetProxyId, OrderWithoutExchangeAddress, RevertReasons, SignedOrder } from '@0xproject/types';
+import { AssetProxyId, OrderWithoutExchangeAddress, RevertReason, SignedOrder } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
@@ -127,7 +127,7 @@ describe('Exchange transactions', () => {
it('should throw if not called by specified sender', async () => {
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.executeTransactionAsync(signedTx, takerAddress),
- RevertReasons.FailedExecution,
+ RevertReason.FailedExecution,
);
});
@@ -170,7 +170,7 @@ describe('Exchange transactions', () => {
await exchangeWrapper.executeTransactionAsync(signedTx, senderAddress);
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.executeTransactionAsync(signedTx, senderAddress),
- RevertReasons.InvalidTxHash,
+ RevertReason.InvalidTxHash,
);
});
@@ -190,7 +190,7 @@ describe('Exchange transactions', () => {
it('should throw if not called by specified sender', async () => {
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.executeTransactionAsync(signedTx, makerAddress),
- RevertReasons.FailedExecution,
+ RevertReason.FailedExecution,
);
});
@@ -198,7 +198,7 @@ describe('Exchange transactions', () => {
await exchangeWrapper.executeTransactionAsync(signedTx, senderAddress);
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrderAsync(signedOrder, senderAddress),
- RevertReasons.OrderUnfillable,
+ RevertReason.OrderUnfillable,
);
});
});
@@ -250,7 +250,7 @@ describe('Exchange transactions', () => {
signedFillTx.signature,
{ from: takerAddress },
),
- RevertReasons.FailedExecution,
+ RevertReason.FailedExecution,
);
});
@@ -369,7 +369,7 @@ describe('Exchange transactions', () => {
signedOrder.signature,
{ from: takerAddress },
),
- RevertReasons.MakerNotWhitelisted,
+ RevertReason.MakerNotWhitelisted,
);
});
@@ -391,7 +391,7 @@ describe('Exchange transactions', () => {
signedOrder.signature,
{ from: takerAddress },
),
- RevertReasons.TakerNotWhitelisted,
+ RevertReason.TakerNotWhitelisted,
);
});
diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts
index a4ba54904..9ee68f94d 100644
--- a/packages/contracts/test/exchange/wrapper.ts
+++ b/packages/contracts/test/exchange/wrapper.ts
@@ -1,6 +1,6 @@
import { BlockchainLifecycle } from '@0xproject/dev-utils';
import { assetProxyUtils } from '@0xproject/order-utils';
-import { AssetProxyId, RevertReasons, SignedOrder } from '@0xproject/types';
+import { AssetProxyId, RevertReason, SignedOrder } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as chai from 'chai';
@@ -172,7 +172,7 @@ describe('Exchange wrappers', () => {
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrKillOrderAsync(signedOrder, takerAddress),
- RevertReasons.OrderUnfillable,
+ RevertReason.OrderUnfillable,
);
});
@@ -185,7 +185,7 @@ describe('Exchange wrappers', () => {
return expectRevertReasonOrAlwaysFailingTransactionAsync(
exchangeWrapper.fillOrKillOrderAsync(signedOrder, takerAddress),
- RevertReasons.CompleteFillFailed,
+ RevertReason.CompleteFillFailed,
);
});
});
@@ -500,7 +500,7 @@ describe('Exchange wrappers', () => {
exchangeWrapper.batchFillOrKillOrdersAsync(signedOrders, takerAddress, {
takerAssetFillAmounts,
}),
- RevertReasons.OrderUnfillable,
+ RevertReason.OrderUnfillable,
);
});
});
@@ -705,7 +705,7 @@ describe('Exchange wrappers', () => {
}),
// We simply use the takerAssetData from the first order for all orders.
// If they are not the same, the contract throws when validating the order signature
- RevertReasons.InvalidOrderSignature,
+ RevertReason.InvalidOrderSignature,
);
});
});
@@ -921,7 +921,7 @@ describe('Exchange wrappers', () => {
exchangeWrapper.marketBuyOrdersAsync(signedOrders, takerAddress, {
makerAssetFillAmount: Web3Wrapper.toBaseUnitAmount(new BigNumber(1000), 18),
}),
- RevertReasons.InvalidOrderSignature,
+ RevertReason.InvalidOrderSignature,
);
});
});
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 22:27:39 +0800