Skip to content

Commit

Permalink
Fix: Integration test assertions (#412)
Browse files Browse the repository at this point in the history
* fix: convert isLiquidatable BN to BigNumber in nakedMarginCallPreExpiry integration test

* fix: convert vaultAfterLiquidation.collateralAmounts to BigNumber in nakedMarginPutPreExpiry integration test

* fix: convert denominator in assertion to BigNumber in nakedMarginPutPreExpiry integration test

* fix: convert collateralNeeded to BigNumber in nakedMarginPutPreExpiry integration test

* fix: convert userVaultAfter.collateralAmounts & isLiquidatable to BigNumber in nakedMarginPutPreExpiry integration test
  • Loading branch information
CruzMolina authored May 28, 2021
1 parent 2b6e305 commit 7de47bc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion test/integration-tests/nakedMarginCallPreExpiry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ contract('Naked margin: call position pre expiry', ([owner, accountOwner1, liqui
)
assert.equal(
userVaultAfter[0].collateralAmounts[0].toString(),
new BigNumber(userVaultBefore[0].collateralAmounts[0]).minus(isLiquidatable[1].toString()).toString(),
new BigNumber(userVaultBefore[0].collateralAmounts[0]).minus(new BigNumber(isLiquidatable[1])).toString(),
'User vault short amount mismatch after liquidation',
)
})
Expand Down
12 changes: 7 additions & 5 deletions test/integration-tests/nakedMarginPutPreExpiry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,9 @@ contract('Naked margin: put position pre expiry', ([owner, accountOwner1, buyer1
isPut,
)
const userVaultBefore = await controllerProxy.getVault(accountOwner1, vaultCounter)
const amountToWithdraw = new BigNumber(userVaultBefore[0].collateralAmounts[0]).minus(collateralNeeded)
const amountToWithdraw = new BigNumber(userVaultBefore[0].collateralAmounts[0]).minus(
new BigNumber(collateralNeeded),
)
const withdrawArgs = [
{
actionType: ActionType.WithdrawCollateral,
Expand Down Expand Up @@ -399,10 +401,10 @@ contract('Naked margin: put position pre expiry', ([owner, accountOwner1, buyer1
assert.equal(vaultAfterLiquidation.shortAmounts[0].toString(), '0', 'Vault was not fully liquidated')
assert.isAtMost(
calcRelativeDiff(
vaultAfterLiquidation.collateralAmounts[0],
new BigNumber(vaultAfterLiquidation.collateralAmounts[0]),
new BigNumber(vaultBeforeLiquidation.collateralAmounts[0]).minus(new BigNumber(isLiquidatable[1])),
)
.dividedBy(10 ** usdcDecimals)
.dividedBy(new BigNumber(10 ** usdcDecimals))
.toNumber(),
errorDelta,
'Vault collateral mismatch after liquidation',
Expand Down Expand Up @@ -673,8 +675,8 @@ contract('Naked margin: put position pre expiry', ([owner, accountOwner1, buyer1
'Liquidator vault short amount mismatch',
)
assert.equal(
userVaultAfter[0].collateralAmounts[0].toString(),
new BigNumber(userVaultBefore[0].collateralAmounts[0]).minus(isLiquidatable[1].toString()).toString(),
new BigNumber(userVaultAfter[0].collateralAmounts[0]).toString(),
new BigNumber(userVaultBefore[0].collateralAmounts[0]).minus(new BigNumber(isLiquidatable[1])).toString(),
'User vault short amount mismatch after liquidation',
)
})
Expand Down

0 comments on commit 7de47bc

Please sign in to comment.