aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-06-08 17:36:40 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-06-08 17:36:40 +0800
commit6d560f1be1f317cbf4352e37d5a7259b2218065c (patch)
treef72af4e22b22b974cb4afd9181fb3078c43315b5
parent931f0f08a52a14c97aa939d98ed3dcf6c72ff6b9 (diff)
downloaddexon-sol-tools-6d560f1be1f317cbf4352e37d5a7259b2218065c.tar
dexon-sol-tools-6d560f1be1f317cbf4352e37d5a7259b2218065c.tar.gz
dexon-sol-tools-6d560f1be1f317cbf4352e37d5a7259b2218065c.tar.bz2
dexon-sol-tools-6d560f1be1f317cbf4352e37d5a7259b2218065c.tar.lz
dexon-sol-tools-6d560f1be1f317cbf4352e37d5a7259b2218065c.tar.xz
dexon-sol-tools-6d560f1be1f317cbf4352e37d5a7259b2218065c.tar.zst
dexon-sol-tools-6d560f1be1f317cbf4352e37d5a7259b2218065c.zip
Address old feedback
-rw-r--r--src/contract_wrappers/exchange_wrapper.ts5
-rw-r--r--src/utils/assert.ts6
2 files changed, 3 insertions, 8 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 107a8f618..57becde24 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -181,7 +181,7 @@ export class ExchangeWrapper extends ContractWrapper {
public async batchFillOrderAsync(orderFillRequests: OrderFillRequest[],
shouldCheckTransfer: boolean, takerAddress: string): Promise<void> {
if (_.isEmpty(orderFillRequests)) {
- return;
+ return; // no-op
}
assert.isBoolean('shouldCheckTransfer', shouldCheckTransfer);
await assert.isSenderAddressAsync('takerAddress', takerAddress, this.web3Wrapper);
@@ -205,10 +205,11 @@ export class ExchangeWrapper extends ContractWrapper {
orderFillRequest.signedOrder.ecSignature.s,
];
});
- // _.unzip doesn't type check if values have different types :'(
+ // We use _.unzip<any> because _.unzip doesn't type check if values have different types :'(
const [orderAddressesArray, orderValuesArray, takerTokenFillAmountArray, vArray, rArray, sArray] = _.unzip<any>(
orderAddressesValuesAmountsAndSignatureArray,
);
+
const gas = await exchangeInstance.batchFill.estimateGas(
orderAddressesArray,
orderValuesArray,
diff --git a/src/utils/assert.ts b/src/utils/assert.ts
index 61b7527e6..4dc6945a2 100644
--- a/src/utils/assert.ts
+++ b/src/utils/assert.ts
@@ -42,12 +42,6 @@ export const assert = {
const availableAddresses = await web3Wrapper.getAvailableAddressesAsync();
this.assert(!_.isEmpty(availableAddresses), 'No addresses were available on the provided web3 instance');
},
- isSameLength(variableName1: string, value1: any[], variableName2: string, value2: any[]) {
- const length1 = value1.length;
- const length2 = value2.length;
- this.assert(length1 === length2, `${variableName1} and ${variableName2} length mismatch. \
-${length1} != ${length2}`);
- },
isNumber(variableName: string, value: number): void {
this.assert(_.isFinite(value), this.typeAssertionMessage(variableName, 'number', value));
},