From f961d3d6dcaf40aab608b23d900ef753785d0677 Mon Sep 17 00:00:00 2001 From: Ethan Date: Tue, 12 Nov 2019 12:34:22 -0500 Subject: [PATCH] Fix errors from removed cdp types --- .../dai-plugin-mcd/test/CdpManager.spec.js | 15 ++--- packages/dai-plugin-mcd/test/CdpType.spec.js | 8 +-- .../test/CdpTypeService.spec.js | 2 +- .../dai-plugin-mcd/test/ManagedCdp.spec.js | 63 ++++++++++--------- 4 files changed, 45 insertions(+), 43 deletions(-) diff --git a/packages/dai-plugin-mcd/test/CdpManager.spec.js b/packages/dai-plugin-mcd/test/CdpManager.spec.js index 8ca514cd5..3e01454e2 100644 --- a/packages/dai-plugin-mcd/test/CdpManager.spec.js +++ b/packages/dai-plugin-mcd/test/CdpManager.spec.js @@ -2,7 +2,7 @@ import findIndex from 'lodash/findIndex'; import { mcdMaker, setupCollateral } from './helpers'; import { setMethod, transferToBag } from '../src/CdpManager'; import { ServiceRoles } from '../src/constants'; -import { ETH, MDAI, GNT, DGD } from '../src'; +import { ETH, MDAI, GNT, DGD, BAT } from '../src'; import { dummyEventData, formattedDummyEventData } from './fixtures'; import { takeSnapshot, restoreSnapshot } from '@makerdao/test-helpers'; @@ -14,9 +14,10 @@ beforeAll(async () => { maker = await mcdMaker({ cdpTypes: [ { currency: ETH, ilk: 'ETH-A' }, - { currency: ETH, ilk: 'ETH-B' }, - { currency: DGD, ilk: 'DGD-A', decimals: 9 }, - { currency: GNT, ilk: 'GNT-A' } + { currency: BAT, ilk: 'BAT-A' } + // { currency: ETH, ilk: 'ETH-B' }, + // { currency: DGD, ilk: 'DGD-A', decimals: 9 }, + // { currency: GNT, ilk: 'GNT-A' } ] }); cdpMgr = maker.service(ServiceRoles.CDP_MANAGER); @@ -37,7 +38,7 @@ test('getCdpIds gets empty CDP data from a proxy', async () => { test('getCdpIds gets all CDP data from the proxy', async () => { const cdp1 = await cdpMgr.open('ETH-A'); - const cdp2 = await cdpMgr.open('ETH-B'); + const cdp2 = await cdpMgr.open('BAT-A'); cdpMgr.reset(); const currentProxy = await maker.currentProxy(); const cdps = await cdpMgr.getCdpIds(currentProxy); @@ -110,7 +111,7 @@ test('transaction tracking for openLockAndDraw', async () => { expect(handlers.mined).toBeCalled(); }); -test('set precision arguments according to decimals', () => { +xtest('set precision arguments according to decimals', () => { expect(cdpMgr._precision(ETH(1))).toBe('wei'); expect(cdpMgr._precision(GNT(1))).toBe(18); expect(cdpMgr._precision(DGD(1))).toBe(9); @@ -124,7 +125,7 @@ test('set method correctly', () => { expect(setMethod(false, true)).toBe('openLockGNTAndDraw'); }); -test('transferToBag for GNT CDPs', async () => { +xtest('transferToBag for GNT CDPs', async () => { const gntToken = maker.service('token').getToken(GNT); const proxyAddress = await maker.service('proxy').currentProxy(); const bagAddress = await maker diff --git a/packages/dai-plugin-mcd/test/CdpType.spec.js b/packages/dai-plugin-mcd/test/CdpType.spec.js index ce8582775..7d0a9a595 100644 --- a/packages/dai-plugin-mcd/test/CdpType.spec.js +++ b/packages/dai-plugin-mcd/test/CdpType.spec.js @@ -14,7 +14,7 @@ beforeAll(async () => { // these CDP types should be available to the Maker instance because // of the configuration passed into it (see test/helpers.js) -const scenarios = [['ETH-A', ETH], ['ETH-B', ETH], ['BAT-A', BAT]]; +const scenarios = [['ETH-A', ETH], ['BAT-A', BAT]]; /* The following arrays are expected values for each tested @@ -24,7 +24,7 @@ const scenarios = [['ETH-A', ETH], ['ETH-B', ETH], ['BAT-A', BAT]]; */ const systemValues = { 'ETH-A': [2, 4, 100000, 1.5, 0.05, '5.0'], - 'ETH-B': [2, 4, 100000, 2, 0.05, '4.0'], + // 'ETH-B': [2, 4, 100000, 2, 0.05, '4.0'], 'BAT-A': [2, 4, 5000, 2, 0.08, '10.5'] }; @@ -106,11 +106,11 @@ describe.each(scenarios)('%s', (ilk, GEM) => { }); test('get system-wide debt', () => { - expect(service.totalDebtAllCdpTypes.toNumber()).toBeCloseTo(12); + expect(service.totalDebtAllCdpTypes.toNumber()).toBeCloseTo(8); }); test('get system-wide collateral value', () => { - expect(service.totalCollateralValueAllCdpTypes.toNumber()).toBeCloseTo(60); + expect(service.totalCollateralValueAllCdpTypes.toNumber()).toBeCloseTo(40); }); test('get system-wide collateralization ratio', async () => { diff --git a/packages/dai-plugin-mcd/test/CdpTypeService.spec.js b/packages/dai-plugin-mcd/test/CdpTypeService.spec.js index d675fae95..1d86ec8ee 100644 --- a/packages/dai-plugin-mcd/test/CdpTypeService.spec.js +++ b/packages/dai-plugin-mcd/test/CdpTypeService.spec.js @@ -15,7 +15,7 @@ test('getCdpType with no matches throws an error', () => { }).toThrowError(/matches no cdp type/); }); -test('getCdpType with too many matches throws an error', () => { +xtest('getCdpType with too many matches throws an error', () => { expect(() => { service.getCdpType(ETH); }).toThrowError(/matches more than one cdp type/); diff --git a/packages/dai-plugin-mcd/test/ManagedCdp.spec.js b/packages/dai-plugin-mcd/test/ManagedCdp.spec.js index 4b14e4d13..69c77519b 100644 --- a/packages/dai-plugin-mcd/test/ManagedCdp.spec.js +++ b/packages/dai-plugin-mcd/test/ManagedCdp.spec.js @@ -1,6 +1,6 @@ import { takeSnapshot, restoreSnapshot } from '@makerdao/test-helpers'; import { mcdMaker, setupCollateral } from './helpers'; -import { ETH, REP, MDAI, USD, GNT, OMG, DGD } from '../src'; +import { ETH, REP, MDAI, USD, GNT, OMG, DGD, BAT } from '../src'; import { ServiceRoles } from '../src/constants'; import { dummyEventData, formattedDummyEventData } from './fixtures'; import { createCurrencyRatio } from '@makerdao/currency'; @@ -13,10 +13,11 @@ beforeAll(async () => { maker = await mcdMaker({ cdpTypes: [ { currency: ETH, ilk: 'ETH-A' }, - { currency: REP, ilk: 'REP-A' }, - { currency: OMG, ilk: 'OMG-A' }, - { currency: DGD, ilk: 'DGD-A', decimals: 9 }, - { currency: GNT, ilk: 'GNT-A' } + { currency: BAT, ilk: 'BAT-A' } + // { currency: REP, ilk: 'REP-A' }, + // { currency: OMG, ilk: 'OMG-A' }, + // { currency: DGD, ilk: 'DGD-A', decimals: 9 }, + // { currency: GNT, ilk: 'GNT-A' } ] }); dai = maker.getToken(MDAI); @@ -32,29 +33,29 @@ afterAll(async () => { }); test('prevent locking the wrong collateral type', async () => { - const cdp = await maker.service(CDP_MANAGER).open('REP-A'); + const cdp = await maker.service(CDP_MANAGER).open('BAT-A'); expect.assertions(1); try { await cdp.lockCollateral(ETH(1)); } catch (err) { - expect(err.message).toMatch(/Can't cast 1.00 ETH as REP/); + expect(err.message).toMatch(/Can't cast 1.00 ETH as BAT/); } }); test('prevent freeing the wrong collateral type', async () => { - const cdp = await maker.service(CDP_MANAGER).open('REP-A'); + const cdp = await maker.service(CDP_MANAGER).open('BAT-A'); expect.assertions(1); try { await cdp.freeCollateral(ETH(1)); } catch (err) { - expect(err.message).toMatch(/Can't cast 1.00 ETH as REP/); + expect(err.message).toMatch(/Can't cast 1.00 ETH as BAT/); } }); test('liquidationPrice and collateralizationRatio are infinite with 0 collateral and 0 debt', async () => { - const cdp = await maker.service(CDP_MANAGER).open('REP-A'); + const cdp = await maker.service(CDP_MANAGER).open('BAT-A'); await cdp.prefetch(); - const ratio = createCurrencyRatio(USD, REP); + const ratio = createCurrencyRatio(USD, BAT); const ratio2 = createCurrencyRatio(USD, MDAI); expect(cdp.liquidationPrice).toEqual(ratio(Infinity)); expect(cdp.collateralizationRatio).toEqual(ratio2(Infinity)); @@ -127,27 +128,27 @@ describe.each([ 'ETH-A', ETH, async () => setupCollateral(maker, 'ETH-A', { price: 150, debtCeiling: 50 }) - ], - [ - 'REP-A', - REP, - async () => setupCollateral(maker, 'REP-A', { price: 100, debtCeiling: 50 }) - ], - [ - 'GNT-A', - GNT, - async () => setupCollateral(maker, 'GNT-A', { price: 100, debtCeiling: 50 }) - ], - [ - 'OMG-A', - OMG, - async () => setupCollateral(maker, 'OMG-A', { price: 100, debtCeiling: 50 }) - ], - [ - 'DGD-A', - DGD, - async () => setupCollateral(maker, 'DGD-A', { price: 100, debtCeiling: 50 }) ] + // [ + // 'REP-A', + // REP, + // async () => setupCollateral(maker, 'REP-A', { price: 100, debtCeiling: 50 }) + // ], + // [ + // 'GNT-A', + // GNT, + // async () => setupCollateral(maker, 'GNT-A', { price: 100, debtCeiling: 50 }) + // ], + // [ + // 'OMG-A', + // OMG, + // async () => setupCollateral(maker, 'OMG-A', { price: 100, debtCeiling: 50 }) + // ], + // [ + // 'DGD-A', + // DGD, + // async () => setupCollateral(maker, 'DGD-A', { price: 100, debtCeiling: 50 }) + // ] ])('%s', (ilk, GEM, setup) => { let startingGemBalance, startingDaiBalance;