refactor: address PR review feedback

• Convert require() to ES6 imports for consistency (chai, ethers)
• Add descriptive comments to empty catch blocks in generateInterfaceIds.js
• Add mocha configuration to hardhat.config.cjs
• Remove commented-out paths configuration
• Add test:coverage script to package.json
• Improve error handling in fixtures.ts (console.warn → console.error + throw)

Author: RembrandtK

packages/issuance/hardhat.config.cjs

@@ -13,12 +13,6 @@ const dotenv = require('dotenv')
 dotenv.config()
 
 const config = {
-  // paths: {
-  //   sources: './contracts',
-  //   tests: './test',
-  //   artifacts: './build/contracts',
-  //   cache: './cache',
-  // },
   solidity: {
     compilers: [
       {
@@ -85,6 +79,10 @@ const config = {
     currency: 'USD',
     outputFile: 'reports/gas-report.log',
   },
+  mocha: {
+    reporter: 'spec',
+    timeout: 60000,
+  },
   typechain: {
     outDir: 'types',
     target: 'ethers-v6',

packages/issuance/package.json

@@ -16,6 +16,7 @@
     "clean": "rm -rf build/ cache/ dist/ forge-artifacts/ cache_forge/",
     "compile": "hardhat compile",
     "test": "pnpm --filter @graphprotocol/issuance-test test",
+    "test:coverage": "pnpm --filter @graphprotocol/issuance-test run test:coverage",
     "lint": "pnpm lint:ts; pnpm lint:sol; pnpm lint:md; pnpm lint:json",
     "lint:ts": "eslint '**/*.{js,ts,cjs,mjs,jsx,tsx}' --fix --cache; prettier -w --cache --log-level warn '**/*.{js,ts,cjs,mjs,jsx,tsx}'",
     "lint:sol": "solhint --fix --noPrompt --noPoster 'contracts/**/*.sol'; prettier -w --cache --log-level warn 'contracts/**/*.sol'",

packages/issuance/test/scripts/generateInterfaceIds.js

@@ -66,7 +66,7 @@ main().catch((error) => {
       try {
         fs.unlinkSync(tempScript)
       } catch {
-        // Ignore cleanup errors
+        // Ignore cleanup errors - temp file may not exist
       }
 
       if (code === 0) {
@@ -80,7 +80,7 @@ main().catch((error) => {
               return
             }
           } catch {
-            // Not JSON, continue
+            // Not JSON, continue - this is expected for non-JSON output lines
           }
         }
         reject(new Error('Could not parse interface IDs from output'))

packages/issuance/test/tests/RewardsEligibilityOracle.test.ts

@@ -2,8 +2,9 @@ import '@nomicfoundation/hardhat-chai-matchers'
 
 import { time } from '@nomicfoundation/hardhat-network-helpers'
 import { expect } from 'chai'
+import { ethers } from 'hardhat'
 
-const { ethers, upgrades } = require('hardhat')
+const { upgrades } = require('hardhat')
 
 import type { IGraphToken, RewardsEligibilityOracle } from '../../types'
 import {
@@ -75,7 +76,8 @@ describe('RewardsEligibilityOracle', () => {
         await rewardsEligibilityOracle.connect(accounts.governor).revokeRole(OPERATOR_ROLE, accounts.governor.address)
       }
     } catch {
-      // Ignore role management errors during reset
+      // Role management errors during reset are non-fatal and may occur if roles are already revoked or not present.
+      // These errors are expected and can be safely ignored.
     }
 
     // Reset to default values

packages/issuance/test/tests/consolidated/AccessControl.test.ts

@@ -4,8 +4,9 @@
  * Tests access control patterns across all contracts to reduce duplication
  */
 
-const { expect } = require('chai')
-const { deploySharedContracts, resetContractState, SHARED_CONSTANTS } = require('../helpers/fixtures')
+import { expect } from 'chai'
+
+import { deploySharedContracts, resetContractState, SHARED_CONSTANTS } from '../helpers/fixtures'
 
 describe('Consolidated Access Control Tests', () => {
   let accounts: any

packages/issuance/test/tests/helpers/fixtures.ts

@@ -5,8 +5,9 @@
 
 import type { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers'
 import * as fs from 'fs'
+import { ethers } from 'hardhat'
 
-const { ethers, upgrades } = require('hardhat')
+const { upgrades } = require('hardhat')
 
 // Shared test constants
 export const SHARED_CONSTANTS = {
@@ -180,6 +181,10 @@ export async function resetContractState(contracts: SharedContracts, accounts: T
       await rewardsEligibilityOracle.connect(accounts.governor).setEligibilityValidation(false)
     }
   } catch (error) {
-    console.warn('RewardsEligibilityOracle state reset failed:', error instanceof Error ? error.message : String(error))
+    console.error(
+      'RewardsEligibilityOracle state reset failed:',
+      error instanceof Error ? error.message : String(error),
+    )
+    throw error
   }
 }

packages/issuance/test/utils/testPatterns.ts

@@ -3,7 +3,7 @@
  * Shared test patterns and utilities to reduce duplication across test files
  */
 
-const { expect } = require('chai')
+import { expect } from 'chai'
 
 // Test constants - centralized to avoid magic numbers
 export const TestConstants = {