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

Move to base units

Browse Source
This commit is contained in:
Jacob Evans 2017-11-21 13:04:36 +11:00
parent 5b8f84f59a
commit bbcee8dfa7
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/0x.js/test/remaining_fillable_calculator_test.ts
View File

@ -5,6 +5,7 @@ import { chaiSetup } from './utils/chai_setup';
import { RemainingFillableCalculator } from '../src/order_watcher/remaining_fillable_calculator'; import { RemainingFillableCalculator } from '../src/order_watcher/remaining_fillable_calculator';
import { SignedOrder, ECSignature } from '../src/types'; import { SignedOrder, ECSignature } from '../src/types';
import { TokenUtils } from './utils/token_utils'; import { TokenUtils } from './utils/token_utils';
import { ZeroEx } from '../src/0x';
chaiSetup.configure(); chaiSetup.configure();
const expect = chai.expect; const expect = chai.expect;
@ -26,7 +27,12 @@ describe.only('RemainingFillableCalculator', () => {
const signature: ECSignature = { v: 27, r: '', s: ''}; const signature: ECSignature = { v: 27, r: '', s: ''};
before(async () => { before(async () => {
[makerToken, takerToken, zrxToken] = ['0x1', '0x2', '0x3']; [makerToken, takerToken, zrxToken] = ['0x1', '0x2', '0x3'];
[makerAmount, takerAmount, makerFee] = [new BigNumber(50), new BigNumber(5), new BigNumber(1)]; [makerAmount, takerAmount, makerFee] = [ZeroEx.toBaseUnitAmount(new BigNumber(50), 18),
ZeroEx.toBaseUnitAmount(new BigNumber(5), 18),
ZeroEx.toBaseUnitAmount(new BigNumber(1), 18)];
[transferrableMakerTokenAmount, transferrableMakerFeeTokenAmount] = [
ZeroEx.toBaseUnitAmount(new BigNumber(50), 18),
ZeroEx.toBaseUnitAmount(new BigNumber(5), 18)];
}); });
function buildSignedOrder(): SignedOrder { function buildSignedOrder(): SignedOrder {
return { ecSignature: signature, return { ecSignature: signature,
@ -45,9 +51,7 @@ describe.only('RemainingFillableCalculator', () => {
} }
it('calculates the correct amount when partially filled and funds available', () => { it('calculates the correct amount when partially filled and funds available', () => {
signedOrder = buildSignedOrder(); signedOrder = buildSignedOrder();
remainingMakerTokenAmount = new BigNumber(1); remainingMakerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(1), 18);
transferrableMakerTokenAmount = new BigNumber(100);
transferrableMakerFeeTokenAmount = transferrableMakerTokenAmount;
calculator = new RemainingFillableCalculator(signedOrder, zrxToken, calculator = new RemainingFillableCalculator(signedOrder, zrxToken,
transferrableMakerTokenAmount, transferrableMakerFeeTokenAmount, remainingMakerTokenAmount); transferrableMakerTokenAmount, transferrableMakerFeeTokenAmount, remainingMakerTokenAmount);
expect(calculator.computeRemainingMakerFillable()).to.be.bignumber.equal(remainingMakerTokenAmount); expect(calculator.computeRemainingMakerFillable()).to.be.bignumber.equal(remainingMakerTokenAmount);
@ -55,7 +59,6 @@ describe.only('RemainingFillableCalculator', () => {
describe('Maker token is NOT ZRX', () => { describe('Maker token is NOT ZRX', () => {
it('calculates the amount to be 0 when all fee funds move', () => { it('calculates the amount to be 0 when all fee funds move', () => {
signedOrder = buildSignedOrder(); signedOrder = buildSignedOrder();
transferrableMakerTokenAmount = new BigNumber(100);
transferrableMakerFeeTokenAmount = zero; transferrableMakerFeeTokenAmount = zero;
remainingMakerTokenAmount = signedOrder.makerTokenAmount; remainingMakerTokenAmount = signedOrder.makerTokenAmount;
calculator = new RemainingFillableCalculator(signedOrder, zrxToken, calculator = new RemainingFillableCalculator(signedOrder, zrxToken,
@ -69,9 +72,7 @@ describe.only('RemainingFillableCalculator', () => {
}); });
it('calculates the correct amount when partially filled and funds available', () => { it('calculates the correct amount when partially filled and funds available', () => {
signedOrder = buildSignedOrder(); signedOrder = buildSignedOrder();
transferrableMakerTokenAmount = new BigNumber(100); remainingMakerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(1), 18);
transferrableMakerFeeTokenAmount = transferrableMakerTokenAmount;
remainingMakerTokenAmount = new BigNumber(1);
calculator = new RemainingFillableCalculator(signedOrder, zrxToken, calculator = new RemainingFillableCalculator(signedOrder, zrxToken,
transferrableMakerTokenAmount, transferrableMakerFeeTokenAmount, remainingMakerTokenAmount); transferrableMakerTokenAmount, transferrableMakerFeeTokenAmount, remainingMakerTokenAmount);
expect(calculator.computeRemainingMakerFillable()).to.be.bignumber.equal(remainingMakerTokenAmount); expect(calculator.computeRemainingMakerFillable()).to.be.bignumber.equal(remainingMakerTokenAmount);
@ -79,7 +80,7 @@ describe.only('RemainingFillableCalculator', () => {
it('calculates the amount to be 0 when all fee funds move', () => { it('calculates the amount to be 0 when all fee funds move', () => {
signedOrder = buildSignedOrder(); signedOrder = buildSignedOrder();
transferrableMakerTokenAmount = zero; transferrableMakerTokenAmount = zero;
transferrableMakerFeeTokenAmount = transferrableMakerTokenAmount; transferrableMakerFeeTokenAmount = zero;
remainingMakerTokenAmount = signedOrder.makerTokenAmount; remainingMakerTokenAmount = signedOrder.makerTokenAmount;
calculator = new RemainingFillableCalculator(signedOrder, zrxToken, calculator = new RemainingFillableCalculator(signedOrder, zrxToken,
transferrableMakerTokenAmount, transferrableMakerFeeTokenAmount, remainingMakerTokenAmount); transferrableMakerTokenAmount, transferrableMakerFeeTokenAmount, remainingMakerTokenAmount);