Skip to content

Commit

Permalink
fix conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
pmckelvy1 committed Sep 25, 2024
1 parent e04cb43 commit b5618ea
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions test/RTokenExtremes.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => {
const MIN_RTOKENS = fp('1e-6')

let paramList
const MIN_THROTTLE_DELTA = 25

if (SLOW) {
const bounds: BigNumber[][] = [
Expand All @@ -219,7 +220,12 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => {
[MIN_WEIGHT, MAX_WEIGHT, fp('0.1')], // weightFirst
[MIN_WEIGHT, MAX_WEIGHT, fp('0.2')], // weightRest
[MIN_ISSUANCE_PCT, fp('1e-2'), fp(1)], // issuanceThrottle.pctRate
[MIN_REDEMPTION_PCT, fp('1e-2').mul(125).div(100), fp(1).mul(125).div(100)], // redemptionThrottle.pctRate
[
MIN_REDEMPTION_PCT,
fp('1e-2').mul(bn(100).add(MIN_THROTTLE_DELTA)).div(100),
fp(1).mul(bn(100).add(MIN_THROTTLE_DELTA)).div(100),
], // redemptionThrottle.pctRate
[bn(6), bn(18), bn(21), bn(27)], // collateralDecimals
]

paramList = cartesianProduct(...bounds)
Expand All @@ -232,7 +238,8 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => {
[MIN_WEIGHT, MAX_WEIGHT], // weightFirst
[MIN_WEIGHT], // weightRest
[MIN_ISSUANCE_PCT, fp(1)], // issuanceThrottle.pctRate
[MIN_REDEMPTION_PCT, fp(1).mul(125).div(100)], // redemptionThrottle.pctRate
[MIN_REDEMPTION_PCT, fp(1).mul(bn(100).add(MIN_THROTTLE_DELTA)).div(100)], // redemptionThrottle.pctRate
[bn(6), bn(18), bn(27)], // collateralDecimals
]
paramList = cartesianProduct(...bounds)
}
Expand Down

0 comments on commit b5618ea

Please sign in to comment.