deploy DAO

contracts/RIFTokenTest.sol

@@ -2,9 +2,3 @@
 pragma solidity ^0.4.24;
 
 import "rif-token-contracts/contracts/RIF/RIFToken.sol";
-// File must exist, else test/RIFTokenTest.ts will fail
-contract RIFTokenTest is RIFToken {
-    constructor () RIFToken () {
-
-    }
-}

package.json

@@ -7,6 +7,7 @@
   "license": "MIT",
   "scripts": {
     "compile": "hardhat compile",
+    "clean": "hardhat clean",
     "lint:ts": "eslint 'test/**/*.ts'",
     "lint:sol": "solhint 'contracts/**/*.sol'",
     "lint": "yarn lint:ts && yarn lint:sol",

scripts/deploy.ts

@@ -1,9 +1,8 @@
 import { ethers } from 'hardhat';
 import { deployDao } from './deploy-dao';
-import { deployRif } from './deploy-rif';
 
 const deploy = async () => {
-  const rifToken = await deployRif();
+  const rifToken = await ethers.deployContract('RIFToken');
   const rifAddress = await rifToken.getAddress();
   const [deployer] = await ethers.getSigners();
   const deployerAddress = await deployer.getAddress();

test/RIFToken.test.ts

@@ -3,12 +3,13 @@ import { ethers } from 'hardhat';
 import { loadFixture } from '@nomicfoundation/hardhat-toolbox/network-helpers';
 import { SignerWithAddress } from '@nomicfoundation/hardhat-ethers/signers';
 import { RIFToken } from '../typechain-types';
-import { deployRif } from '../scripts/deploy-rif';
 
 describe('RIFToken Contract', function () {
   let owner: SignerWithAddress, addr1: SignerWithAddress, addr2: SignerWithAddress;
   let rifToken: RIFToken;
 
+  const deployRif = () => ethers.deployContract('RIFToken');
+
   before(async () => {
     [owner, addr1, addr2] = await ethers.getSigners();
     rifToken = await loadFixture(deployRif);