Skip to content

Commit c62701c

Browse files
committed
fix trading extremes.
1 parent 0c08710 commit c62701c

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

test/ZTradingExtremes.test.ts

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`,
260260
const trade = <GnosisTrade>await ethers.getContractAt('GnosisTrade', tradeAddr)
261261
const gnosis = <GnosisMock>await ethers.getContractAt('GnosisMock', await trade.gnosis())
262262
const auctionId = await trade.auctionId()
263-
console.log('auctionId', auctionId)
264263
const [, , buy, sellAmt, buyAmt] = await gnosis.auctions(auctionId)
265264
expect(buy == rToken.address || buy == rsr.address)
266265
if (buy == rToken.address) {
@@ -351,7 +350,11 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`,
351350
while ((await rToken.balanceOf(addr1.address)) < rTokenSupply) {
352351
await advanceTime(3600)
353352
const remaining = rTokenSupply.sub(await rToken.balanceOf(addr1.address))
354-
await rToken.connect(addr1).issue(remaining.mod(noThrottleIssuance.amtRate))
353+
const amt =
354+
remaining < noThrottleIssuance.amtRate
355+
? remaining
356+
: noThrottleIssuance.amtRate.mod(remaining)
357+
await rToken.connect(addr1).issue(amt)
355358
}
356359
expect(await rToken.balanceOf(addr1.address)).to.equal(rTokenSupply)
357360

@@ -493,7 +496,11 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`,
493496
while ((await rToken.balanceOf(addr1.address)) < rTokenSupply) {
494497
await advanceTime(3600)
495498
const remaining = rTokenSupply.sub(await rToken.balanceOf(addr1.address))
496-
await rToken.connect(addr1).issue(remaining.mod(noThrottleIssuance.amtRate))
499+
const amt =
500+
remaining < noThrottleIssuance.amtRate
501+
? remaining
502+
: noThrottleIssuance.amtRate.mod(remaining)
503+
await rToken.connect(addr1).issue(amt)
497504
}
498505
expect(await rToken.balanceOf(addr1.address)).to.equal(rTokenSupply)
499506

@@ -671,7 +678,11 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`,
671678
while ((await rToken.balanceOf(addr1.address)) < rTokenSupply) {
672679
await advanceTime(3600)
673680
const remaining = rTokenSupply.sub(await rToken.balanceOf(addr1.address))
674-
await rToken.connect(addr1).issue(remaining.mod(noThrottleIssuance.amtRate))
681+
const amt =
682+
remaining < noThrottleIssuance.amtRate
683+
? remaining
684+
: noThrottleIssuance.amtRate.mod(remaining)
685+
await rToken.connect(addr1).issue(amt)
675686
}
676687

677688
// === Execution ===

0 commit comments

Comments
 (0)