aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-11-28 07:07:37 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-11-28 07:38:38 +0800
commit0500602ac3e8d4ea3c54d1cf2d4dcc2b0bcf80ba (patch)
tree300573ade30c90ba4df8459205789dd47ad5c9e7
parente6887dc9d4b129eee062c9c2f80a970548ee7650 (diff)
downloaddexon-sol-tools-0500602ac3e8d4ea3c54d1cf2d4dcc2b0bcf80ba.tar
dexon-sol-tools-0500602ac3e8d4ea3c54d1cf2d4dcc2b0bcf80ba.tar.gz
dexon-sol-tools-0500602ac3e8d4ea3c54d1cf2d4dcc2b0bcf80ba.tar.bz2
dexon-sol-tools-0500602ac3e8d4ea3c54d1cf2d4dcc2b0bcf80ba.tar.lz
dexon-sol-tools-0500602ac3e8d4ea3c54d1cf2d4dcc2b0bcf80ba.tar.xz
dexon-sol-tools-0500602ac3e8d4ea3c54d1cf2d4dcc2b0bcf80ba.tar.zst
dexon-sol-tools-0500602ac3e8d4ea3c54d1cf2d4dcc2b0bcf80ba.zip
Fix tests
-rw-r--r--packages/0x.js/test/exchange_wrapper_test.ts5
-rw-r--r--yarn.lock18
2 files changed, 9 insertions, 14 deletions
diff --git a/packages/0x.js/test/exchange_wrapper_test.ts b/packages/0x.js/test/exchange_wrapper_test.ts
index 3e2160330..d862c347d 100644
--- a/packages/0x.js/test/exchange_wrapper_test.ts
+++ b/packages/0x.js/test/exchange_wrapper_test.ts
@@ -184,6 +184,7 @@ describe('ExchangeWrapper', () => {
it('should not validate when orderTransactionOptions specify not to validate', async () => {
return expect(zeroEx.exchange.fillOrKillOrderAsync(signedOrder, emptyFillableAmount, takerAddress, {
shouldValidate: false,
+ gasLimit: 200000, // If we don't pass this gas estimation will fail
})).to.not.be.rejectedWith(ExchangeContractErrs.OrderFillAmountZero);
});
});
@@ -363,6 +364,7 @@ describe('ExchangeWrapper', () => {
return expect(zeroEx.exchange.batchFillOrdersAsync(
orderFillBatch, shouldThrowOnInsufficientBalanceOrAllowance, takerAddress, {
shouldValidate: false,
+ gasLimit: 200000, // If we don't pass this gas estimation will fail
})).to.not.be.rejectedWith(ExchangeContractErrs.OrderFillAmountZero);
});
});
@@ -420,6 +422,7 @@ describe('ExchangeWrapper', () => {
return expect(zeroEx.exchange.fillOrdersUpToAsync(
signedOrders, emptyFillUpToAmount, shouldThrowOnInsufficientBalanceOrAllowance, takerAddress, {
shouldValidate: false,
+ gasLimit: 200000, // If we don't pass this gas estimation will fail
})).to.not.be.rejectedWith(ExchangeContractErrs.OrderFillAmountZero);
});
});
@@ -468,6 +471,7 @@ describe('ExchangeWrapper', () => {
it('should not validate when orderTransactionOptions specify not to validate', async () => {
return expect(zeroEx.exchange.cancelOrderAsync(signedOrder, emptyCancelTakerTokenAmount, {
shouldValidate: false,
+ gasLimit: 200000, // If we don't pass this gas estimation will fail
})).to.not.be.rejectedWith(ExchangeContractErrs.OrderCancelAmountZero);
});
});
@@ -543,6 +547,7 @@ describe('ExchangeWrapper', () => {
it('should not validate when orderTransactionOptions specify not to validate', async () => {
return expect(zeroEx.exchange.batchCancelOrdersAsync(cancelBatch, {
shouldValidate: false,
+ gasLimit: 200000, // If we don't pass this gas estimation will fail
})).to.not.be.rejectedWith(ExchangeContractErrs.OrderCancelAmountZero);
});
});
diff --git a/yarn.lock b/yarn.lock
index 962b45e63..f7a51e1e6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6,6 +6,10 @@
version "0.4.1"
resolved "https://registry.yarnpkg.com/@types/accounting/-/accounting-0.4.1.tgz#865d9f5694fd7c438fba34eb4bc82eec6f34cdd5"
+"@types/bintrees@^1.0.2":
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/@types/bintrees/-/bintrees-1.0.2.tgz#0dfdce4eeebdf90427bd35b0e79dc248b3d157a6"
+
"@types/dateformat@^1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@types/dateformat/-/dateformat-1.0.1.tgz#2e5b235c8c55652c4fec284506d2a36fe65fe87e"
@@ -18,14 +22,6 @@
version "5.12.2"
resolved "https://registry.yarnpkg.com/@types/fetch-mock/-/fetch-mock-5.12.2.tgz#8c96517ff74303031c65c5da2d99858e34c844d2"
-"@types/bintrees@^1.0.2":
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/@types/bintrees/-/bintrees-1.0.2.tgz#0dfdce4eeebdf90427bd35b0e79dc248b3d157a6"
-
-"@types/fetch-mock@^5.12.1":
- version "5.12.2"
- resolved "https://registry.yarnpkg.com/@types/fetch-mock/-/fetch-mock-5.12.2.tgz#8c96517ff74303031c65c5da2d99858e34c844d2"
-
"@types/fs-extra@^4.0.0":
version "4.0.5"
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-4.0.5.tgz#8aa6033c0e87c653b09a6711686916864b48ec9e"
@@ -2892,12 +2888,6 @@ ethereumjs-blockstream@^2.0.6:
source-map-support "0.4.14"
uuid "3.0.1"
-ethereumjs-testrpc@4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/ethereumjs-testrpc/-/ethereumjs-testrpc-4.0.1.tgz#af23babff4c36008418bc6de4c80f81606896cad"
- dependencies:
- webpack "^3.0.0"
-
ethereumjs-testrpc@^6.0.3:
version "6.0.3"
resolved "https://registry.yarnpkg.com/ethereumjs-testrpc/-/ethereumjs-testrpc-6.0.3.tgz#7a0b87bf3670f92f607f98fa6a78801d9741b124"