Skip to content

Commit

Permalink
fixed conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
BkChoy committed Mar 20, 2024
1 parent f35d8f1 commit 4c07e69
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/core/rebase-controller.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ describe('RebaseController', () => {
assert.equal(await insurancePool.claimInProgress(), false)

await token.transfer(strategy3.address, toEther(300))
await rebaseController.updateRewards([2], '0x')
await rebaseController.updateRewards([2], '0x', [])
await strategy3.simulateSlash(toEther(301))
await rebaseController.performUpkeep(encode([[2], toEther(301)]))

Expand All @@ -203,7 +203,7 @@ describe('RebaseController', () => {
await expect(rebaseController.performUpkeep(encode([[2], 1]))).to.be.revertedWith(
'PoolClosed()'
)
await expect(rebaseController.updateRewards([2], '0x')).to.be.revertedWith('PoolClosed()')
await expect(rebaseController.updateRewards([2], '0x', [])).to.be.revertedWith('PoolClosed()')
assert.equal((await rebaseController.checkUpkeep('0x00'))[0], false)

await stakingPool.donateTokens(toEther(101))
Expand Down

0 comments on commit 4c07e69

Please sign in to comment.