feat: refactor fee withdrawal tests to use setup helper function

Author: cctdaniel

target_chains/ethereum/contracts/forge-test/EntropyAuthorized.t.sol

@@ -175,134 +175,78 @@ contract EntropyAuthorized is Test, EntropyTestUtils {
         random.acceptAdmin();
     }
 
-    function testWithdrawFeeByAdmin() public {
-        // Register provider1 first
+    // Helper function to setup contract with fees
+    function setupContractWithFees(
+        uint128 feeAmount,
+        uint numRequests
+    ) internal returns (uint128 totalFees) {
+        // Register provider1
         bytes32[] memory hashChain = generateHashChain(provider1, 0, 100);
         vm.prank(provider1);
         random.register(0, hashChain[0], hex"0100", 100, "");
 
-        // First accrue some fees through requests
+        // Set Pyth fee
         vm.prank(admin);
-        random.setPythFee(10);
+        random.setPythFee(feeAmount);
 
-        // Make a few requests to accrue fees
+        // Make requests to accrue fees
         bytes32 userCommitment = random.constructUserCommitment(
             bytes32(uint256(42))
         );
-        vm.deal(address(this), 50);
-        for (uint i = 0; i < 5; i++) {
-            random.request{value: 10}(provider1, userCommitment, false);
+        vm.deal(address(this), feeAmount * numRequests);
+        for (uint i = 0; i < numRequests; i++) {
+            random.request{value: feeAmount}(provider1, userCommitment, false);
         }
-        assertEq(random.getAccruedPythFees(), 50);
+
+        totalFees = uint128(feeAmount * numRequests);
+        assertEq(random.getAccruedPythFees(), totalFees);
+        return totalFees;
+    }
+
+    function testWithdrawFeeByAdmin() public {
+        uint128 totalFees = setupContractWithFees(10, 5);
 
         address targetAddress = address(123);
         uint128 withdrawAmount = 30;
 
         vm.prank(admin);
         random.withdrawFee(targetAddress, withdrawAmount);
 
-        assertEq(random.getAccruedPythFees(), 20);
+        assertEq(random.getAccruedPythFees(), totalFees - withdrawAmount);
         assertEq(targetAddress.balance, withdrawAmount);
     }
 
     function testWithdrawFeeByOwner() public {
-        // Register provider1 first
-        bytes32[] memory hashChain = generateHashChain(provider1, 0, 100);
-        vm.prank(provider1);
-        random.register(0, hashChain[0], hex"0100", 100, "");
-
-        // First accrue some fees through requests
-        vm.prank(admin);
-        random.setPythFee(10);
-
-        // Make a few requests to accrue fees
-        bytes32 userCommitment = random.constructUserCommitment(
-            bytes32(uint256(42))
-        );
-        vm.deal(address(this), 50);
-        for (uint i = 0; i < 5; i++) {
-            random.request{value: 10}(provider1, userCommitment, false);
-        }
-        assertEq(random.getAccruedPythFees(), 50);
+        uint128 totalFees = setupContractWithFees(10, 5);
 
         address targetAddress = address(123);
         uint128 withdrawAmount = 30;
 
         vm.prank(owner);
         random.withdrawFee(targetAddress, withdrawAmount);
 
-        assertEq(random.getAccruedPythFees(), 20);
+        assertEq(random.getAccruedPythFees(), totalFees - withdrawAmount);
         assertEq(targetAddress.balance, withdrawAmount);
     }
 
     function testWithdrawFeeByUnauthorized() public {
-        // Register provider1 first
-        bytes32[] memory hashChain = generateHashChain(provider1, 0, 100);
-        vm.prank(provider1);
-        random.register(0, hashChain[0], hex"0100", 100, "");
-
-        // First accrue some fees through requests
-        vm.prank(admin);
-        random.setPythFee(10);
-
-        // Make a few requests to accrue fees
-        bytes32 userCommitment = random.constructUserCommitment(
-            bytes32(uint256(42))
-        );
-        vm.deal(address(this), 50);
-        for (uint i = 0; i < 5; i++) {
-            random.request{value: 10}(provider1, userCommitment, false);
-        }
+        setupContractWithFees(10, 5);
 
         vm.prank(admin2);
         vm.expectRevert(EntropyErrors.Unauthorized.selector);
         random.withdrawFee(address(123), 30);
     }
 
     function testWithdrawFeeInsufficientBalance() public {
-        // Register provider1 first
-        bytes32[] memory hashChain = generateHashChain(provider1, 0, 100);
-        vm.prank(provider1);
-        random.register(0, hashChain[0], hex"0100", 100, "");
-
-        // First accrue some fees through requests
-        vm.prank(admin);
-        random.setPythFee(10);
-
-        // Make a few requests to accrue fees
-        bytes32 userCommitment = random.constructUserCommitment(
-            bytes32(uint256(42))
-        );
-        vm.deal(address(this), 50);
-        for (uint i = 0; i < 5; i++) {
-            random.request{value: 10}(provider1, userCommitment, false);
-        }
-        assertEq(random.getAccruedPythFees(), 50);
+        uint128 totalFees = setupContractWithFees(10, 5);
 
         vm.prank(admin);
         vm.expectRevert(EntropyErrors.InsufficientFee.selector);
-        random.withdrawFee(address(123), 60);
+        random.withdrawFee(address(123), totalFees + 10);
     }
 
     function testWithdrawFeeToZeroAddress() public {
-        // Register provider1 first
-        bytes32[] memory hashChain = generateHashChain(provider1, 0, 100);
-        vm.prank(provider1);
-        random.register(0, hashChain[0], hex"0100", 100, "");
-
-        // First accrue some fees through requests
-        vm.prank(admin);
-        random.setPythFee(10);
-
-        // Make a few requests to accrue fees
-        bytes32 userCommitment = random.constructUserCommitment(
-            bytes32(uint256(42))
-        );
-        vm.deal(address(this), 50);
-        for (uint i = 0; i < 5; i++) {
-            random.request{value: 10}(provider1, userCommitment, false);
-        }
-        assertEq(random.getAccruedPythFees(), 50);
+        setupContractWithFees(10, 5);
 
         vm.prank(admin);
         vm.expectRevert("targetAddress is zero address");