fix most.

reserve-protocol · Dec 12, 2023 · a57b077 · a57b077
1 parent 52bb0f7
commit a57b077
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -14,6 +14,7 @@ import { useEnv } from '#/utils/env'
 import { forkRpcs, Network } from '#/utils/fork'
 import { HardhatUserConfig } from 'hardhat/types'
 import forkBlockNumber from '#/test/integration/fork-block-numbers'
+import { fp } from './common/numbers'
 
 // eslint-disable-next-line node/no-missing-require
 require('#/tasks')
@@ -45,6 +46,11 @@ const config: HardhatUserConfig = {
       gas: 0x1ffffffff,
       blockGasLimit: 0x1fffffffffffff,
       allowUnlimitedContractSize: true,
+      accounts: [
+        { privateKey: new Array(65).join('1'), balance: fp(1e6).toString() },
+        { privateKey: new Array(65).join('2'), balance: fp(1e6).toString() },
+        { privateKey: new Array(65).join('3'), balance: fp(1e6).toString() },
+      ]
     },
     localhost: {
       // network for long-lived mainnet forks

diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts
@@ -452,6 +452,8 @@ export default function fn<X extends CollateralFixtureContext>(
       })
 
       describe('status', () => {
+        before(resetFork)
+
         it('maintains status in normal situations', async () => {
           // Check initial state
           expect(await collateral.status()).to.equal(CollateralStatus.SOUND)

diff --git a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts
@@ -99,10 +99,10 @@ export const deployCollateral = async (opts: SfrxEthCollateralOpts = {}): Promis
 
   // Push forward chainlink fee
   await pushOracleForward(opts.chainlinkFeed!)
-  await pushOracleForward(opts.targetPerTokChainlinkFeed!)
-  // opts.targetPerTokChainlinkFeed?.toLocaleLowerCase() == SFRXETH_ETH_PRICE_FEED.toLocaleLowerCase() ?
-  //   await pushFraxOracleForward(opts.targetPerTokChainlinkFeed ?? SFRXETH_ETH_PRICE_FEED) :
-  //   await pushOracleForward(opts.targetPerTokChainlinkFeed!)
+  // await pushOracleForward(opts.targetPerTokChainlinkFeed!)
+  opts.targetPerTokChainlinkFeed?.toLocaleLowerCase() == SFRXETH_ETH_PRICE_FEED.toLocaleLowerCase() ?
+    await pushFraxOracleForward(opts.targetPerTokChainlinkFeed ?? SFRXETH_ETH_PRICE_FEED) :
+    await pushOracleForward(opts.targetPerTokChainlinkFeed!)
   // sometimes we are trying to test a negative test case and we want this to fail silently
   // fortunately this syntax fails silently because our tools are terrible
   await expect(collateral.refresh())

diff --git a/test/utils/oracles.ts b/test/utils/oracles.ts
@@ -182,7 +182,6 @@ export const pushFraxOracleForward = async (chainlinkAddr: string) => {
   const chainlinkFeed = await ethers.getContractAt('FraxAggregatorV3Interface', chainlinkAddr)
   let initPrice = (await chainlinkFeed.latestRoundData()).answer
   await whileImpersonating(await chainlinkFeed.priceSource(), async (owner) => {
-    // await user.sendTransaction({ to: owner.address, value: ethers.utils.parseEther('1') })
     await chainlinkFeed.connect(owner).addRoundData(false, initPrice, initPrice, await getLatestBlockTimestamp() + 1)
   })
 }