Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: CI assertions #442

Merged
merged 3 commits into from
Sep 19, 2021
Merged

Fix: CI assertions #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2436601
fix: errorDelta for naked margin put pre expiry integration tests to …
CruzMolina Aug 24, 2021
98c41a8
fix: convert user vault short amount mismatch assertion from equal to…
CruzMolina Aug 24, 2021
c90dd08
fix: convert liquidator collateral balance mismatch assertion from eq…
CruzMolina Aug 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions test/integration-tests/nakedMarginCallPreExpiry.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,9 +684,15 @@ contract('Naked margin: call position pre expiry', ([owner, accountOwner1, liqui
createTokenAmount(0),
'Liquidator vault short amount mismatch',
)
assert.equal(
new BigNumber(userVaultAfter[0].collateralAmounts[0].toString()).toString(),
new BigNumber(userVaultBefore[0].collateralAmounts[0]).minus(new BigNumber(isLiquidatable[1])).toString(),

assert.isAtMost(
calcRelativeDiff(
new BigNumber(userVaultAfter[0].collateralAmounts[0]),
new BigNumber(userVaultBefore[0].collateralAmounts[0]).minus(new BigNumber(isLiquidatable[1])),
)
.dividedBy(new BigNumber(10 ** wethDecimals))
.toNumber(),
new BigNumber(errorDelta).toNumber(),
'User vault short amount mismatch after liquidation',
)
})
Expand Down
14 changes: 10 additions & 4 deletions test/integration-tests/nakedMarginPutPreExpiry.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ contract('Naked margin: put position pre expiry', ([owner, accountOwner1, buyer1
const shortStrike = 2000
const isPut = true // delta error because liquidation price differ based on block timestamp of isLiquidatable() and the actual liquidation tx
const shortAmount = 1
const errorDelta = 0.1
const errorDelta = 0.25

let addressBook: AddressBookInstance
let calculator: MarginCalculatorInstance
Expand Down Expand Up @@ -639,6 +639,7 @@ contract('Naked margin: put position pre expiry', ([owner, accountOwner1, buyer1
)[0]

assert.equal(vaultAfterLiquidation.shortAmounts[0].toString(), '0', 'Vault was not fully liquidated')

assert.isAtMost(
calcRelativeDiff(
new BigNumber(vaultAfterLiquidation.collateralAmounts[0]),
Expand All @@ -649,16 +650,21 @@ contract('Naked margin: put position pre expiry', ([owner, accountOwner1, buyer1
new BigNumber(errorDelta).toNumber(),
'Vault collateral mismatch after liquidation',
)
assert.equal(
liquidatorUsdcAfter.toString(),
liquidatorUsdcBefore.minus(collateralToDeposit).plus(isLiquidatable[1]).toString(),

assert.isAtMost(
calcRelativeDiff(liquidatorUsdcAfter, liquidatorUsdcBefore.minus(collateralToDeposit).plus(isLiquidatable[1]))
.dividedBy(new BigNumber(10 ** usdcDecimals))
.toNumber(),
new BigNumber(errorDelta).toNumber(),
'Liquidator collateral balance mismatch after liquidation',
)

assert.equal(
poolUsdcAfter.plus(isLiquidatable[1].toString()).minus(collateralToDeposit.toString()).toString(),
poolUsdcBefore.toString(),
'Pool balance after openining position mismatch',
)

assert.equal(
liquidatorVaultAfter[0].collateralAmounts[0].toString(),
collateralToDeposit.toString(),
Expand Down