refactor: consolidate test fixtures and fix documentation

• Consolidated duplicate test fixture files into single fixtures.ts
• Removed circular dependency between fixtures.ts and sharedFixtures.ts
• Fixed incorrect function calls (grantOperatorRole → grantRole,
  setValidityPeriod → setEligibilityPeriod)
• Updated default eligibility period from 7 days to 14 days (matches contract default)
• Updated all test imports to use consolidated fixtures
• Fixed RewardsManagerV6Storage class documentation comment

Author: RembrandtK

packages/contracts/contracts/rewards/RewardsManagerStorage.sol

@@ -78,7 +78,7 @@ contract RewardsManagerV5Storage is RewardsManagerV4Storage {
 }
 
 /**
- * @title RewardsManagerV5Storage
+ * @title RewardsManagerV6Storage
  * @author Edge & Node
  * @notice Storage layout for RewardsManager V6
  */

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

@@ -10,9 +10,9 @@ import {
   deployRewardsEligibilityOracle,
   deployTestGraphToken,
   getTestAccounts,
+  SHARED_CONSTANTS,
   type TestAccounts,
 } from './helpers/fixtures'
-import { SHARED_CONSTANTS } from './helpers/sharedFixtures'
 
 // Role constants
 const GOVERNOR_ROLE = SHARED_CONSTANTS.GOVERNOR_ROLE

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

@@ -5,7 +5,7 @@
  */
 
 const { expect } = require('chai')
-const { deploySharedContracts, resetContractState, SHARED_CONSTANTS } = require('../helpers/sharedFixtures')
+const { deploySharedContracts, resetContractState, SHARED_CONSTANTS } = require('../helpers/fixtures')
 
 describe('Consolidated Access Control Tests', () => {
   let accounts: any

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

@@ -1,9 +1,28 @@
+/**
+ * Test fixtures and setup utilities
+ * Contains deployment functions, shared constants, and test utilities
+ */
+
 import type { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers'
 import * as fs from 'fs'
 
 const { ethers, upgrades } = require('hardhat')
-const { SHARED_CONSTANTS } = require('./sharedFixtures')
-const { OPERATOR_ROLE } = SHARED_CONSTANTS
+
+// Shared test constants
+export const SHARED_CONSTANTS = {
+  PPM: 1_000_000,
+
+  // Pre-calculated role constants to avoid repeated async calls
+  GOVERNOR_ROLE: ethers.keccak256(ethers.toUtf8Bytes('GOVERNOR_ROLE')),
+  OPERATOR_ROLE: ethers.keccak256(ethers.toUtf8Bytes('OPERATOR_ROLE')),
+  PAUSE_ROLE: ethers.keccak256(ethers.toUtf8Bytes('PAUSE_ROLE')),
+  ORACLE_ROLE: ethers.keccak256(ethers.toUtf8Bytes('ORACLE_ROLE')),
+} as const
+
+// Interface IDs
+export const INTERFACE_IDS = {
+  IERC165: '0x01ffc9a7',
+} as const
 
 // Types
 export interface TestAccounts {
@@ -15,6 +34,24 @@ export interface TestAccounts {
   indexer2: HardhatEthersSigner
 }
 
+export interface SharedContracts {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  graphToken: any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  rewardsEligibilityOracle: any
+}
+
+export interface SharedAddresses {
+  graphToken: string
+  rewardsEligibilityOracle: string
+}
+
+export interface SharedFixtures {
+  accounts: TestAccounts
+  contracts: SharedContracts
+  addresses: SharedAddresses
+}
+
 /**
  * Get standard test accounts
  */
@@ -60,12 +97,12 @@ export async function deployTestGraphToken(): Promise<any> {
  * Deploy the RewardsEligibilityOracle contract with proxy using OpenZeppelin's upgrades library
  * @param graphToken The Graph Token contract address
  * @param governor The governor signer
- * @param validityPeriod The validity period in seconds (default: 7 days)
+ * @param validityPeriod The validity period in seconds (default: 14 days)
  */
 export async function deployRewardsEligibilityOracle(
   graphToken: string,
   governor: HardhatEthersSigner,
-  validityPeriod: number = 7 * 24 * 60 * 60, // 7 days in seconds
+  validityPeriod: number = 14 * 24 * 60 * 60, // 14 days in seconds (contract default)
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ): Promise<any> {
   // Deploy implementation and proxy using OpenZeppelin's upgrades library
@@ -84,14 +121,65 @@ export async function deployRewardsEligibilityOracle(
   // Get the contract instance
   const rewardsEligibilityOracle = rewardsEligibilityOracleContract
 
-  // Set the validity period if it's different from the default
-  if (validityPeriod !== 7 * 24 * 60 * 60) {
-    // First grant operator role to governor so they can set the validity period
-    await rewardsEligibilityOracle.connect(governor).grantOperatorRole(governor.address)
-    await rewardsEligibilityOracle.connect(governor).setValidityPeriod(validityPeriod)
+  // Set the eligibility period if it's different from the default (14 days)
+  if (validityPeriod !== 14 * 24 * 60 * 60) {
+    // First grant operator role to governor so they can set the eligibility period
+    await rewardsEligibilityOracle.connect(governor).grantRole(SHARED_CONSTANTS.OPERATOR_ROLE, governor.address)
+    await rewardsEligibilityOracle.connect(governor).setEligibilityPeriod(validityPeriod)
     // Now revoke the operator role from governor to ensure tests start with clean state
-    await rewardsEligibilityOracle.connect(governor).revokeRole(OPERATOR_ROLE, governor.address)
+    await rewardsEligibilityOracle.connect(governor).revokeRole(SHARED_CONSTANTS.OPERATOR_ROLE, governor.address)
   }
 
   return rewardsEligibilityOracle
 }
+
+/**
+ * Shared contract deployment and setup
+ */
+export async function deploySharedContracts(): Promise<SharedFixtures> {
+  const accounts = await getTestAccounts()
+
+  // Deploy base contracts
+  const graphToken = await deployTestGraphToken()
+  const graphTokenAddress = await graphToken.getAddress()
+
+  const rewardsEligibilityOracle = await deployRewardsEligibilityOracle(graphTokenAddress, accounts.governor)
+
+  // Cache addresses
+  const addresses: SharedAddresses = {
+    graphToken: graphTokenAddress,
+    rewardsEligibilityOracle: await rewardsEligibilityOracle.getAddress(),
+  }
+
+  // Create helper
+  return {
+    accounts,
+    contracts: {
+      graphToken,
+      rewardsEligibilityOracle,
+    },
+    addresses,
+  }
+}
+
+/**
+ * Reset contract state to initial conditions
+ * Optimized to avoid redeployment while ensuring clean state
+ */
+export async function resetContractState(contracts: SharedContracts, accounts: TestAccounts): Promise<void> {
+  const { rewardsEligibilityOracle } = contracts
+
+  // Reset RewardsEligibilityOracle state
+  try {
+    if (await rewardsEligibilityOracle.paused()) {
+      await rewardsEligibilityOracle.connect(accounts.governor).unpause()
+    }
+
+    // Reset eligibility validation to default (disabled)
+    if (await rewardsEligibilityOracle.getEligibilityValidation()) {
+      await rewardsEligibilityOracle.connect(accounts.governor).setEligibilityValidation(false)
+    }
+  } catch (error) {
+    console.warn('RewardsEligibilityOracle state reset failed:', error instanceof Error ? error.message : String(error))
+  }
+}