aboutsummaryrefslogtreecommitdiffstats
path: root/src/contract_wrappers
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-06-02 18:19:00 +0800
committerFabio Berger <me@fabioberger.com>2017-06-02 18:19:00 +0800
commit104b7f2549e0164f629594c590b3d2d936ba66d0 (patch)
tree27d95a236662f1ec048da3e88b75a418a64b5346 /src/contract_wrappers
parent7b0341bc8aa21d65e7456f9b3797d111a4786c86 (diff)
parent9d9b6f7cc0b71874f73c0f7c1d55f5010fe0609f (diff)
downloaddexon-sol-tools-104b7f2549e0164f629594c590b3d2d936ba66d0.tar
dexon-sol-tools-104b7f2549e0164f629594c590b3d2d936ba66d0.tar.gz
dexon-sol-tools-104b7f2549e0164f629594c590b3d2d936ba66d0.tar.bz2
dexon-sol-tools-104b7f2549e0164f629594c590b3d2d936ba66d0.tar.lz
dexon-sol-tools-104b7f2549e0164f629594c590b3d2d936ba66d0.tar.xz
dexon-sol-tools-104b7f2549e0164f629594c590b3d2d936ba66d0.tar.zst
dexon-sol-tools-104b7f2549e0164f629594c590b3d2d936ba66d0.zip
Merge branch 'fillOrderAsync' into addEventSubscriptions
# Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts
Diffstat (limited to 'src/contract_wrappers')
-rw-r--r--src/contract_wrappers/exchange_wrapper.ts3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 2894c5a9f..f32cb88a6 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -180,6 +180,9 @@ export class ExchangeWrapper extends ContractWrapper {
if (fillAmount.greaterThan(takerBalance)) {
throw new Error(FillOrderValidationErrs.NOT_ENOUGH_TAKER_BALANCE);
}
+ if (fillAmount.greaterThan(takerAllowance)) {
+ throw new Error(FillOrderValidationErrs.NOT_ENOUGH_TAKER_ALLOWANCE);
+ }
}
private throwErrorLogsAsErrors(logs: ContractEvent[]): void {
const errEvent = _.find(logs, {event: 'LogError'});