From 51b66c9c48b0771a96ecb4a1903a53332f5e2203 Mon Sep 17 00:00:00 2001 From: Debugger022 Date: Sat, 2 Sep 2023 17:08:36 +0530 Subject: [PATCH] fix: tests --- tests/hardhat/Fork/RewardsForkTest.ts | 3 +-- tests/hardhat/Fork/RiskFund.ts | 6 ++---- tests/hardhat/Fork/RiskFundSwap.ts | 5 ++--- tests/hardhat/Fork/Shortfall.ts | 3 +-- tests/hardhat/Fork/borrowAndRepayTest.ts | 5 ++--- tests/hardhat/Fork/liquidation.ts | 3 +-- tests/hardhat/Fork/reduceReservesTest.ts | 3 +-- tests/hardhat/Fork/supply.ts | 3 +-- tests/hardhat/Fork/utils.ts | 10 ++-------- 9 files changed, 13 insertions(+), 28 deletions(-) diff --git a/tests/hardhat/Fork/RewardsForkTest.ts b/tests/hardhat/Fork/RewardsForkTest.ts index 002a83afd..da72449ff 100644 --- a/tests/hardhat/Fork/RewardsForkTest.ts +++ b/tests/hardhat/Fork/RewardsForkTest.ts @@ -26,8 +26,7 @@ const { expect } = chai; chai.use(smock.matchers); const FORKING = process.env.FORKING === "true"; -let network = process.env.NETWORK_NAME; -if (network == "") network = "bsc"; +const network = process.env.NETWORK_NAME || "bsc"; const { ACM, diff --git a/tests/hardhat/Fork/RiskFund.ts b/tests/hardhat/Fork/RiskFund.ts index 6491d77f1..c132951a3 100644 --- a/tests/hardhat/Fork/RiskFund.ts +++ b/tests/hardhat/Fork/RiskFund.ts @@ -26,8 +26,8 @@ import { import { deployVTokenBeacon, makeVToken } from "../util/TokenTestHelpers"; import { getContractAddresses, setForkBlock } from "./utils"; -let network = process.env.NETWORK_NAME; -if (network == "") network = "bsc"; +const FORKING = process.env.FORKING === "true"; +const network = process.env.NETWORK_NAME || "bsc"; const { PANCAKE_SWAP_ROUTER, BUSD_HOLDER, USDC_HOLDER, USDT_HOLDER, BLOCK_NUMBER } = getContractAddresses( network as string, @@ -59,8 +59,6 @@ let busdUser: SignerWithAddress; let usdcUser: SignerWithAddress; let usdtUser: SignerWithAddress; const maxLoopsLimit = 150; - -const FORKING = process.env.FORKING === "true"; const someNonzeroAddress = "0x0000000000000000000000000000000000000001"; const initPancakeSwapRouter = async ( diff --git a/tests/hardhat/Fork/RiskFundSwap.ts b/tests/hardhat/Fork/RiskFundSwap.ts index 3fbc6b510..c09347e97 100644 --- a/tests/hardhat/Fork/RiskFundSwap.ts +++ b/tests/hardhat/Fork/RiskFundSwap.ts @@ -23,8 +23,8 @@ import { import { deployVTokenBeacon, makeVToken } from "../util/TokenTestHelpers"; import { getContractAddresses, initMainnetUser, setForkBlock } from "./utils"; -let network = process.env.NETWORK_NAME; -if (network == "") network = "bsc"; +const FORKING = process.env.FORKING === "true"; +const network = process.env.NETWORK_NAME || "bsc"; const { PANCAKE_SWAP_ROUTER, BUSD_HOLDER, USDT_HOLDER, BLOCK_NUMBER } = getContractAddresses(network as string); @@ -45,7 +45,6 @@ let busdUser: SignerWithAddress; let usdtUser: SignerWithAddress; const maxLoopsLimit = 150; -const FORKING = process.env.FORKING === "true"; const ADD_RESERVE_AMOUNT = parseUnits("100", 18); const REDUCE_RESERVE_AMOUNT = parseUnits("50", 18); diff --git a/tests/hardhat/Fork/Shortfall.ts b/tests/hardhat/Fork/Shortfall.ts index 25592586a..263567b6e 100644 --- a/tests/hardhat/Fork/Shortfall.ts +++ b/tests/hardhat/Fork/Shortfall.ts @@ -27,8 +27,7 @@ import { import { getContractAddresses, initMainnetUser, setForkBlock } from "./utils"; const FORKING = process.env.FORKING === "true"; -let network = process.env.NETWORK_NAME; -if (network == "") network = "bsc"; +const network = process.env.NETWORK_NAME || "bsc"; const { ADMIN, diff --git a/tests/hardhat/Fork/borrowAndRepayTest.ts b/tests/hardhat/Fork/borrowAndRepayTest.ts index 1f37015ea..1876237a1 100644 --- a/tests/hardhat/Fork/borrowAndRepayTest.ts +++ b/tests/hardhat/Fork/borrowAndRepayTest.ts @@ -25,9 +25,8 @@ const { expect } = chai; chai.use(smock.matchers); const FORKING = process.env.FORKING === "true"; -let network = process.env.NETWORK_NAME; -if (network == "") network = "bsc"; - +const network = process.env.NETWORK_NAME || "bsc"; +console.log(network); const { ACM, ACC1, diff --git a/tests/hardhat/Fork/liquidation.ts b/tests/hardhat/Fork/liquidation.ts index 5f65a6414..c60d37a8b 100644 --- a/tests/hardhat/Fork/liquidation.ts +++ b/tests/hardhat/Fork/liquidation.ts @@ -25,8 +25,7 @@ const { expect } = chai; chai.use(smock.matchers); const FORKING = process.env.FORKING === "true"; -let network = process.env.NETWORK_NAME; -if (network == "") network = "bsc"; +const network = process.env.NETWORK_NAME || "bsc"; const { ACM, diff --git a/tests/hardhat/Fork/reduceReservesTest.ts b/tests/hardhat/Fork/reduceReservesTest.ts index ed007d1f8..c6b5be919 100644 --- a/tests/hardhat/Fork/reduceReservesTest.ts +++ b/tests/hardhat/Fork/reduceReservesTest.ts @@ -22,8 +22,7 @@ const { expect } = chai; chai.use(smock.matchers); const FORKING = process.env.FORKING === "true"; -let network = process.env.NETWORK_NAME; -if (network == "") network = "bsc"; +const network = process.env.NETWORK_NAME || "bsc"; const { ACM, ACC1, ACC2, ADMIN, TOKEN1, VTOKEN1, TOKEN1_HOLDER, COMPTROLLER, BLOCK_NUMBER } = getContractAddresses( network as string, diff --git a/tests/hardhat/Fork/supply.ts b/tests/hardhat/Fork/supply.ts index 177aab76d..d5ddf0b88 100644 --- a/tests/hardhat/Fork/supply.ts +++ b/tests/hardhat/Fork/supply.ts @@ -25,8 +25,7 @@ const { expect } = chai; chai.use(smock.matchers); const FORKING = process.env.FORKING === "true"; -let network = process.env.NETWORK_NAME; -if (network == "") network = "bsc"; +const network = process.env.NETWORK_NAME || "bsc"; const { ACM, diff --git a/tests/hardhat/Fork/utils.ts b/tests/hardhat/Fork/utils.ts index ad22305d9..6fb184fa3 100644 --- a/tests/hardhat/Fork/utils.ts +++ b/tests/hardhat/Fork/utils.ts @@ -5,17 +5,11 @@ import { ethers, network } from "hardhat"; import { archiveNodes, contractAddreseses } from "./constants"; function getArchieveNode(name: string) { - if (name != "") { - return archiveNodes[name]; - } - return archiveNodes["bsc"]; + return archiveNodes[name]; } export function getContractAddresses(name: string) { - if (name != "") { - return contractAddreseses[name]; - } - return contractAddreseses["bsc"]; + return contractAddreseses[name]; } export const forking = (blockNumber: number, fn: () => void) => {