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

Add more tests and fixes

Browse Source
This commit is contained in:
Amir Bandeali
2018-07-22 23:04:49 -05:00
parent 45d68285f1
commit dcc0908617
8 changed files with 484 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

877
packages/contracts/test/forwarder/forwarder.ts
View File

File diff suppressed because it is too large Load Diff

4
packages/contracts/test/utils/forwarder_wrapper.ts
View File

@@ -25,13 +25,13 @@ export class ForwarderWrapper {
let remainingFeeAmount = feeAmount;
_.forEach(feeOrders, feeOrder => {
const feeAvailable = feeOrder.makerAssetAmount.minus(feeOrder.takerFee);
if (!remainingFeeAmount.isZero() && feeAvailable.gte(remainingFeeAmount)) {
if (!remainingFeeAmount.isZero() && feeAvailable.gt(remainingFeeAmount)) {
wethAmount = wethAmount
.plus(feeOrder.takerAssetAmount.times(remainingFeeAmount).dividedToIntegerBy(feeAvailable))
.plus(1);
remainingFeeAmount = new BigNumber(0);
} else if (!remainingFeeAmount.isZero()) {
wethAmount = wethAmount.plus(feeOrder.takerAssetAmount).plus(1);
wethAmount = wethAmount.plus(feeOrder.takerAssetAmount);
remainingFeeAmount = remainingFeeAmount.minus(feeAvailable);
}
});