Merge pull request #226 from VenusProtocol/remove-unnecessary-scenarios

refactor: remove unnecessary scenarios
VenusProtocol · Sep 19, 2024 · e5612b7 · e5612b7
2 parents 7bdc00a + e1c96ae
commit e5612b7
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 23 deletions.
diff --git a/contracts/test/AccessControlManager.sol b/contracts/test/AccessControlManager.sol
diff --git a/contracts/test/VAI.sol b/contracts/test/VAI.sol
diff --git a/deploy/1-deploy-oracles.ts b/deploy/1-deploy-oracles.ts
@@ -15,26 +15,26 @@ const func: DeployFunction = async function ({
 
   let accessControlManager;
   if (!network.live) {
-    await deploy("AccessControlManagerScenario", {
+    await deploy("AccessControlManager", {
       from: deployer,
       args: [],
       log: true,
       autoMine: true,
     });
 
-    accessControlManager = await hre.ethers.getContract("AccessControlManagerScenario");
+    accessControlManager = await hre.ethers.getContract("AccessControlManager");
   }
 
   let vai;
   if (!network.live) {
-    await deploy("VAIScenario", {
+    await deploy("VAI", {
       from: deployer,
       log: true,
       autoMine: true,
       args: [await getChainId()],
     });
 
-    vai = await hre.ethers.getContract("VAIScenario");
+    vai = await hre.ethers.getContract("VAI");
   }
   const accessControlManagerAddress = network.live ? ADDRESSES[network.name].acm : accessControlManager?.address;
   const proxyOwnerAddress = network.live ? ADDRESSES[network.name].timelock : deployer;

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -293,6 +293,16 @@ const config: HardhatUserConfig = {
     pages: "files",
     templates: "./docgen-templates",
   },
+  external: {
+    contracts: [
+      {
+        artifacts: "node_modules/@venusprotocol/venus-protocol/artifacts",
+      },
+      {
+        artifacts: "node_modules/@venusprotocol/governance-contracts/artifacts",
+      },
+    ],
+  },
 };
 
 export default config;
diff --git a/test/BinanceOracle.ts b/test/BinanceOracle.ts
@@ -32,7 +32,7 @@ describe("Binance Oracle unit tests", () => {
     sidRegistry.resolver.returns(publicResolver.address);
     publicResolver.addr.returns(this.mockBinanceFeedRegistry.address);
 
-    const fakeAccessControlManager = await smock.fake<AccessControlManager>("AccessControlManagerScenario");
+    const fakeAccessControlManager = await smock.fake<AccessControlManager>("AccessControlManager");
     fakeAccessControlManager.isAllowedToCall.returns(true);
     this.fakeAccessControlManager = fakeAccessControlManager;
 

diff --git a/test/BoundValidator.ts b/test/BoundValidator.ts
@@ -13,7 +13,7 @@ const EXP_SCALE = BigNumber.from(10).pow(18);
 const getBoundValidator = async (account: SignerWithAddress) => {
   const boundValidator = await ethers.getContractFactory("BoundValidator", account);
 
-  const fakeAccessControlManager = await smock.fake<AccessControlManager>("AccessControlManagerScenario");
+  const fakeAccessControlManager = await smock.fake<AccessControlManager>("AccessControlManager");
   fakeAccessControlManager.isAllowedToCall.returns(true);
 
   return <BoundValidator>await upgrades.deployProxy(boundValidator, [fakeAccessControlManager.address], {

diff --git a/test/ChainlinkOracle.ts b/test/ChainlinkOracle.ts
@@ -37,7 +37,7 @@ describe("Oracle unit tests", () => {
     this.daiFeed = await makeChainlinkOracle(8, 100000000);
 
     const chainlinkOracle = await ethers.getContractFactory("ChainlinkOracle", admin);
-    const fakeAccessControlManager = await smock.fake<AccessControlManager>("AccessControlManagerScenario");
+    const fakeAccessControlManager = await smock.fake<AccessControlManager>("AccessControlManager");
     fakeAccessControlManager.isAllowedToCall.returns(true);
 
     const instance = <ChainlinkOracle>await upgrades.deployProxy(chainlinkOracle, [fakeAccessControlManager.address], {

diff --git a/test/PivotPythOracle.ts b/test/PivotPythOracle.ts
@@ -25,7 +25,7 @@ const getPythOracle = deployments.createFixture(async ({ getNamedAccounts }) =>
   });
 
   const pythOracle = await ethers.getContractFactory("PythOracle", deployer);
-  const fakeAccessControlManager = await smock.fake<AccessControlManager>("AccessControlManagerScenario");
+  const fakeAccessControlManager = await smock.fake<AccessControlManager>("AccessControlManager");
   fakeAccessControlManager.isAllowedToCall.returns(true);
 
   const instance = <PythOracle>await upgrades.deployProxy(

diff --git a/test/ResilientOracle.ts b/test/ResilientOracle.ts
@@ -43,7 +43,7 @@ describe("Oracle plugin frame unit tests", () => {
   });
 
   beforeEach(async function () {
-    const fakeAccessControlManager = await smock.fake<AccessControlManager>("AccessControlManagerScenario");
+    const fakeAccessControlManager = await smock.fake<AccessControlManager>("AccessControlManager");
     fakeAccessControlManager.isAllowedToCall.returns(true);
 
     const resilientOracle = await ethers.getContractFactory("ResilientOracle", this.admin);

diff --git a/test/SFrxETHOracle.ts b/test/SFrxETHOracle.ts
@@ -38,7 +38,7 @@ describe("SFrxETHOracle unit tests", () => {
 
     SFrxETHOracleFactory = await ethers.getContractFactory("SFrxETHOracle");
 
-    fakeAccessControlManager = await smock.fake<AccessControlManager>("AccessControlManagerScenario");
+    fakeAccessControlManager = await smock.fake<AccessControlManager>("AccessControlManager");
     fakeAccessControlManager.isAllowedToCall.returns(true);
   });