fix: working tests

test/asset-info-test.ts

@@ -1,4 +1,10 @@
 import { expect, exp, makeProtocol, ONE } from './helpers';
+import { ethers } from 'hardhat';
+import {
+  SimplePriceFeed__factory,
+  FaucetToken__factory,
+  CometHarness__factory
+} from '../build/types';
 
 describe('asset info', function () {
   it('initializes protocol', async () => {
@@ -34,29 +40,86 @@ describe('asset info', function () {
   });
 
   it('reverts if too many assets are passed', async () => {
+    let priceFeeds = {};
+    const assets = {
+      USDC: {},
+      ASSET1: {},
+      ASSET2: {},
+      ASSET3: {},
+      ASSET4: {},
+      ASSET5: {},
+      ASSET6: {},
+      ASSET7: {},
+      ASSET8: {},
+      ASSET9: {},
+      ASSET10: {},
+      ASSET11: {},
+      ASSET12: {},
+      ASSET13: {},
+      ASSET14: {},
+      ASSET15: {},
+      ASSET16: {},
+    };
+    const base = 'USDC';
+    const PriceFeedFactory = (await ethers.getContractFactory('SimplePriceFeed')) as SimplePriceFeed__factory;
+    for (const asset in assets) {
+      const initialPrice = exp(assets[asset].initialPrice || 1, 8);
+      const priceFeedDecimals = assets[asset].priceFeedDecimals || 8;
+      const priceFeed = await PriceFeedFactory.deploy(initialPrice, priceFeedDecimals);
+      await priceFeed.deployed();
+      priceFeeds[asset] = priceFeed;
+    }
+    const FaucetFactory = (await ethers.getContractFactory('FaucetToken')) as FaucetToken__factory;
+    const tokens = {};
+    for (const symbol in assets) {
+      const config = assets[symbol];
+      const decimals = config.decimals || 18;
+      const initial = config.initial || 1e6;
+      const name = config.name || symbol;
+      const factory = config.factory || FaucetFactory;
+      let token;
+      token = (tokens[symbol] = await factory.deploy(initial, name, decimals, symbol));
+      await token.deployed();
+    }
+    const config = {
+      governor: ethers.constants.AddressZero,
+      pauseGuardian: ethers.constants.AddressZero,
+      extensionDelegate: ethers.constants.AddressZero,
+      baseToken: tokens[base].address,
+      baseTokenPriceFeed: priceFeeds[base].address,
+      supplyKink: 0,
+      supplyPerYearInterestRateBase: 0,
+      supplyPerYearInterestRateSlopeLow: 0,
+      supplyPerYearInterestRateSlopeHigh: 0,
+      borrowKink: 0,
+      borrowPerYearInterestRateBase: 0,
+      borrowPerYearInterestRateSlopeLow: 0,
+      borrowPerYearInterestRateSlopeHigh: 0,
+      storeFrontPriceFactor: 8,
+      trackingIndexScale: 0,
+      baseTrackingSupplySpeed: 0,
+      baseTrackingBorrowSpeed: 0,
+      baseMinForRewards: 0,
+      baseBorrowMin: 0,
+      targetReserves: 0,
+      assetConfigs: Object.entries(assets).reduce((acc, [symbol], _i) => {
+        if (symbol != base) {
+          acc.push({
+            asset: tokens[symbol].address,
+            priceFeed: priceFeeds[symbol].address,
+            decimals: 18,
+            borrowCollateralFactor: ONE - 1n,
+            liquidateCollateralFactor: ONE,
+            liquidationFactor: ONE,
+            supplyCap: exp(100, 18),
+          });
+        }
+        return acc;
+      }, []),
+    };
+    const CometFactory = (await ethers.getContractFactory('CometHarness')) as CometHarness__factory;
     await expect(
-      makeProtocol({
-        assets: {
-          USDC: {},
-          ASSET1: {},
-          ASSET2: {},
-          ASSET3: {},
-          ASSET4: {},
-          ASSET5: {},
-          ASSET6: {},
-          ASSET7: {},
-          ASSET8: {},
-          ASSET9: {},
-          ASSET10: {},
-          ASSET11: {},
-          ASSET12: {},
-          ASSET13: {},
-          ASSET14: {},
-          ASSET15: {},
-          ASSET16: {},
-        },
-        reward: 'ASSET1',
-      })
+      CometFactory.deploy(config)
     ).to.be.revertedWith("custom error 'TooManyAssets()'");
   });
 

test/helpers.ts

@@ -7,6 +7,7 @@ import {
   BaseBulker,
   BaseBulker__factory,
   CometExt,
+  CometExt__factory,
   CometExtAssetList__factory,
   CometHarness__factory,
   CometHarnessInterface as Comet,
@@ -282,8 +283,8 @@ export async function makeProtocol(opts: ProtocolOpts = {}): Promise<Protocol> {
 
   let extensionDelegate = opts.extensionDelegate;
   if (extensionDelegate === undefined) {
-    const CometExtFactory = (await ethers.getContractFactory('CometExtAssetList')) as CometExtAssetList__factory;
-    extensionDelegate = await CometExtFactory.deploy({ name32, symbol32 }, assetListFactory.address);
+    const CometExtFactory = (await ethers.getContractFactory('CometExt')) as CometExt__factory;
+    extensionDelegate = await CometExtFactory.deploy({ name32, symbol32 });
     await extensionDelegate.deployed();
   }
 
@@ -310,7 +311,7 @@ export async function makeProtocol(opts: ProtocolOpts = {}): Promise<Protocol> {
     baseBorrowMin,
     targetReserves,
     assetConfigs: Object.entries(assets).reduce((acc, [symbol, config], _i) => {
-      if (symbol != base && _i < 12) {
+      if (symbol != base && _i <= 12) {
         acc.push({
           asset: tokens[symbol].address,
           priceFeed: priceFeeds[symbol].address,
@@ -341,7 +342,13 @@ export async function makeProtocol(opts: ProtocolOpts = {}): Promise<Protocol> {
     }
     return acc;
   }, []);
-
+  let extensionDelegateAssetList = opts.extensionDelegate;
+  if (extensionDelegateAssetList === undefined) {
+    const CometExtFactory = (await ethers.getContractFactory('CometExtAssetList')) as CometExtAssetList__factory;
+    extensionDelegateAssetList = await CometExtFactory.deploy({ name32, symbol32 }, assetListFactory.address);
+    await extensionDelegateAssetList.deployed();
+  }
+  config.extensionDelegate = extensionDelegateAssetList.address;
   const CometFactoryExtendedAssetList = (await ethers.getContractFactory('CometHarnessExtendedAssetList')) as CometHarnessExtendedAssetList__factory;
 
   const cometExtendedAssetList = await CometFactoryExtendedAssetList.deploy(config);