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

Pass in fee and assetAmount rather then the whole signedOrder

Browse Source
This commit is contained in:
Fabio Berger
2018-06-07 18:33:42 +02:00
parent dee0fec9e9
commit f5ad553be3
3 changed files with 26 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
packages/order-utils/test/remaining_fillable_calculator_test.ts
View File

@@ -65,10 +65,9 @@ describe('RemainingFillableCalculator', () => {
it('calculates the correct amount when unfilled and funds available', () => {
signedOrder = buildSignedOrder();
remainingMakeAssetAmount = signedOrder.makerAssetAmount;
const isTraderMaker = true;
calculator = new RemainingFillableCalculator(
isTraderMaker,
signedOrder,
signedOrder.makerFee,
signedOrder.makerAssetAmount,
isMakeAssetZRX,
transferrableMakeAssetAmount,
transferrableMakerFeeTokenAmount,
@@ -79,10 +78,9 @@ describe('RemainingFillableCalculator', () => {
it('calculates the correct amount when partially filled and funds available', () => {
signedOrder = buildSignedOrder();
remainingMakeAssetAmount = Web3Wrapper.toBaseUnitAmount(new BigNumber(1), decimals);
const isTraderMaker = true;
calculator = new RemainingFillableCalculator(
isTraderMaker,
signedOrder,
signedOrder.makerFee,
signedOrder.makerAssetAmount,
isMakeAssetZRX,
transferrableMakeAssetAmount,
transferrableMakerFeeTokenAmount,
@@ -94,10 +92,9 @@ describe('RemainingFillableCalculator', () => {
signedOrder = buildSignedOrder();
transferrableMakerFeeTokenAmount = zero;
remainingMakeAssetAmount = signedOrder.makerAssetAmount;
const isTraderMaker = true;
calculator = new RemainingFillableCalculator(
isTraderMaker,
signedOrder,
signedOrder.makerFee,
signedOrder.makerAssetAmount,
isMakeAssetZRX,
transferrableMakeAssetAmount,
transferrableMakerFeeTokenAmount,
@@ -110,10 +107,9 @@ describe('RemainingFillableCalculator', () => {
const partiallyFilledAmount = Web3Wrapper.toBaseUnitAmount(new BigNumber(2), decimals);
remainingMakeAssetAmount = signedOrder.makerAssetAmount.minus(partiallyFilledAmount);
transferrableMakeAssetAmount = remainingMakeAssetAmount.minus(partiallyFilledAmount);
const isTraderMaker = true;
calculator = new RemainingFillableCalculator(
isTraderMaker,
signedOrder,
signedOrder.makerFee,
signedOrder.makerAssetAmount,
isMakeAssetZRX,
transferrableMakeAssetAmount,
transferrableMakerFeeTokenAmount,
@@ -134,10 +130,9 @@ describe('RemainingFillableCalculator', () => {
remainingMakeAssetAmount = signedOrder.makerAssetAmount;
const transferredAmount = Web3Wrapper.toBaseUnitAmount(new BigNumber(2), decimals);
transferrableMakeAssetAmount = remainingMakeAssetAmount.minus(transferredAmount);
const isTraderMaker = true;
calculator = new RemainingFillableCalculator(
isTraderMaker,
signedOrder,
signedOrder.makerFee,
signedOrder.makerAssetAmount,
isMakeAssetZRX,
transferrableMakeAssetAmount,
transferrableMakerFeeTokenAmount,
@@ -159,10 +154,9 @@ describe('RemainingFillableCalculator', () => {
remainingMakeAssetAmount = signedOrder.makerAssetAmount;
const transferredAmount = Web3Wrapper.toBaseUnitAmount(new BigNumber(2), decimals);
transferrableMakeAssetAmount = remainingMakeAssetAmount.minus(transferredAmount);
const isTraderMaker = true;
calculator = new RemainingFillableCalculator(
isTraderMaker,
signedOrder,
signedOrder.makerFee,
signedOrder.makerAssetAmount,
isMakeAssetZRX,
transferrableMakeAssetAmount,
transferrableMakerFeeTokenAmount,
@@ -186,10 +180,9 @@ describe('RemainingFillableCalculator', () => {
transferrableMakeAssetAmount = makerAmount.plus(makerFeeAmount);
transferrableMakerFeeTokenAmount = transferrableMakeAssetAmount;
remainingMakeAssetAmount = signedOrder.makerAssetAmount;
const isTraderMaker = true;
calculator = new RemainingFillableCalculator(
isTraderMaker,
signedOrder,
signedOrder.makerFee,
signedOrder.makerAssetAmount,
isMakeAssetZRX,
transferrableMakeAssetAmount,
transferrableMakerFeeTokenAmount,
@@ -200,10 +193,9 @@ describe('RemainingFillableCalculator', () => {
it('calculates the correct amount when partially filled and funds available', () => {
signedOrder = buildSignedOrder();
remainingMakeAssetAmount = Web3Wrapper.toBaseUnitAmount(new BigNumber(1), decimals);
const isTraderMaker = true;
calculator = new RemainingFillableCalculator(
isTraderMaker,
signedOrder,
signedOrder.makerFee,
signedOrder.makerAssetAmount,
isMakeAssetZRX,
transferrableMakeAssetAmount,
transferrableMakerFeeTokenAmount,
@@ -216,10 +208,9 @@ describe('RemainingFillableCalculator', () => {
transferrableMakeAssetAmount = zero;
transferrableMakerFeeTokenAmount = zero;
remainingMakeAssetAmount = signedOrder.makerAssetAmount;
const isTraderMaker = true;
calculator = new RemainingFillableCalculator(
isTraderMaker,
signedOrder,
signedOrder.makerFee,
signedOrder.makerAssetAmount,
isMakeAssetZRX,
transferrableMakeAssetAmount,
transferrableMakerFeeTokenAmount,
@@ -236,10 +227,9 @@ describe('RemainingFillableCalculator', () => {
const orderToFeeRatio = signedOrder.makerAssetAmount.dividedToIntegerBy(signedOrder.makerFee);
const expectedFillableAmount = new BigNumber(450980);
const isTraderMaker = true;
calculator = new RemainingFillableCalculator(
isTraderMaker,
signedOrder,
signedOrder.makerFee,
signedOrder.makerAssetAmount,
isMakeAssetZRX,
transferrableMakeAssetAmount,
transferrableMakerFeeTokenAmount,