Change key from uint8 to bytes32 (#3)

Author: mikeghen

src/QueryTypeStakerFactory.sol

@@ -7,20 +7,20 @@ import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 /// @title QueryTypeStakerFactory
 /// @author [ScopeLift](https://scopelift.co)
-/// @notice This contract manages the creation of staking pools for different query types.
-/// Each query type can have one active staking pool, and only the contract owner can create new
-/// pools.
+/// @notice This contract manages the creation of staking pools for different query type bit fields.
+/// Each query type bit field can have one active staking pool, and only the contract owner can
+/// create new pools.
 contract QueryTypeStakerFactory is Ownable {
   /// @notice The token that will be used for staking.
   IERC20 public immutable STAKING_TOKEN;
 
-  /// @notice Maps query types to their corresponding staking pool addresses.
-  mapping(uint8 queryType => address poolAddress) public queryTypePools;
+  /// @notice Maps query type bit fields to their corresponding staking pool addresses.
+  mapping(bytes32 queryType => address poolAddress) public queryTypePools;
 
-  /// @notice Emitted when a new staking pool is created for a query type.
-  event CreateQueryTypeStakingPool(uint8 indexed queryType, address indexed poolAddress);
+  /// @notice Emitted when a new staking pool is created for a query type bit field.
+  event CreateQueryTypeStakingPool(bytes32 indexed queryType, address indexed poolAddress);
 
-  /// @notice Thrown when attempting to create a pool for a query type that already has one.
+  /// @notice Thrown when attempting to create a pool for a query type bit field that exists.
   error QueryTypeStakerFactory__PoolExists();
 
   /// @notice Thrown when an invalid (zero) token address is provided.
@@ -34,13 +34,13 @@ contract QueryTypeStakerFactory is Ownable {
     STAKING_TOKEN = IERC20(_stakingToken);
   }
 
-  /// @notice Creates a new staking pool for a specific query type.
-  /// @param _queryType The type of query this pool will be associated with.
+  /// @notice Creates a new staking pool for a specific query type bit field.
+  /// @param _queryType The bit field representing the queries this pool will support.
   /// @param _poolOwner The address that will own the staking pool.
   /// @param _initialEntry The initial conversion table entry for the pool.
   /// @return _poolAddress The address of the newly created staking pool.
   /// @dev Only callable by the contract owner.
-  function createStakingPool(uint8 _queryType, address _poolOwner, bytes32 _initialEntry)
+  function createStakingPool(bytes32 _queryType, address _poolOwner, bytes32 _initialEntry)
     external
     returns (address _poolAddress)
   {

test/QueryTypeStakerFactory.t.sol

@@ -10,14 +10,14 @@ contract QueryTypeStakerFactoryTest is Test {
   QueryTypeStakerFactory public factory;
   address public owner;
   address public stakingToken;
-  uint8 public queryType;
+  bytes32 public queryType;
 
   function setUp() public virtual {
     owner = makeAddr("owner");
     stakingToken = makeAddr("stakingToken");
     vm.prank(owner);
     factory = new QueryTypeStakerFactory(owner, stakingToken);
-    queryType = 1;
+    queryType = bytes32(uint256(1));
   }
 
   function _createPool() internal returns (address) {
@@ -45,7 +45,7 @@ contract Constructor is QueryTypeStakerFactoryTest {
 
 contract CreateStakingPool is QueryTypeStakerFactoryTest {
   function testFuzz_CreatesNewStakingPoolWithArbitraryQueryType(
-    uint8 _queryType,
+    bytes32 _queryType,
     address _poolOwner,
     bytes32 _initialEntry
   ) public {
@@ -59,7 +59,7 @@ contract CreateStakingPool is QueryTypeStakerFactoryTest {
   }
 
   function testFuzz_EmitsCreateQueryTypeStakingPoolEventWithArbitraryQueryType(
-    uint8 _queryType,
+    bytes32 _queryType,
     address _poolOwner,
     bytes32 _initialEntry
   ) public {
@@ -69,8 +69,8 @@ contract CreateStakingPool is QueryTypeStakerFactoryTest {
     address poolAddress = factory.createStakingPool(_queryType, _poolOwner, _initialEntry);
 
     VmSafe.Log[] memory entries = vm.getRecordedLogs();
-    assertEq(entries[2].topics[0], keccak256("CreateQueryTypeStakingPool(uint8,address)"));
-    assertEq(entries[2].topics[1], bytes32(uint256(_queryType))); // queryType
+    assertEq(entries[2].topics[0], keccak256("CreateQueryTypeStakingPool(bytes32,address)"));
+    assertEq(entries[2].topics[1], _queryType); // queryType
     assertEq(entries[2].topics[2], bytes32(uint256(uint160(poolAddress)))); // poolAddress
   }
 
@@ -88,7 +88,7 @@ contract CreateStakingPool is QueryTypeStakerFactoryTest {
   }
 
   function testFuzz_RevertIf_PoolAlreadyExistsWithArbitraryQueryType(
-    uint8 _queryType,
+    bytes32 _queryType,
     address _poolOwner,
     bytes32 _initialEntry
   ) public {