@bananapus/core-v6 0.0.14 → 0.0.16

package/test/units/static/JBMultiTerminal/TestUseAllowanceOf.sol

@@ -1,7 +1,21 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBMultiTerminal} from "../../../../src/JBMultiTerminal.sol";
+import {IJBController} from "../../../../src/interfaces/IJBController.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBFeelessAddresses} from "../../../../src/interfaces/IJBFeelessAddresses.sol";
+import {IJBPayoutTerminal} from "../../../../src/interfaces/IJBPayoutTerminal.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {JBPayHookSpecification} from "../../../../src/structs/JBPayHookSpecification.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBTokenAmount} from "../../../../src/structs/JBTokenAmount.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {JBMultiTerminalSetup} from "./JBMultiTerminalSetup.sol";
 
 contract TestUseAllowanceOf_Local is JBMultiTerminalSetup {
@@ -177,6 +191,7 @@ contract TestUseAllowanceOf_Local is JBMultiTerminalSetup {
         // Weight for a fee calculation that would take place in terminal store
         uint112 weight = 1000 * 10 ** 18;
 
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint32 currencyId = uint32(uint160(mockToken));
 
         // Start the cascade of issuing project tokens to the fee beneficiary. (recieving platform tokens for paying a
@@ -288,6 +303,7 @@ contract TestUseAllowanceOf_Local is JBMultiTerminalSetup {
         });
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     modifier whenMsgSenderDNEQFeeless() {
         _;
     }

package/test/units/static/JBPermissions/JBPermissionsSetup.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBPermissions} from "../../../../src/JBPermissions.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 /*

package/test/units/static/JBPermissions/TestHasPermission.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBPermissions} from "../../../../src/JBPermissions.sol";
 import {JBPermissionsSetup} from "./JBPermissionsSetup.sol";
 
 contract TestHasPermissions_Local is JBPermissionsSetup {

package/test/units/static/JBPermissions/TestHasPermissions.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBPermissions} from "../../../../src/JBPermissions.sol";
 import {JBPermissionsSetup} from "./JBPermissionsSetup.sol";
 
 contract TestHasPermissions_Local is JBPermissionsSetup {

package/test/units/static/JBPermissions/TestSetPermissionsFor.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBPermissions} from "../../../../src/JBPermissions.sol";
+import {JBPermissionsData} from "../../../../src/structs/JBPermissionsData.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
 import {JBPermissionsSetup} from "./JBPermissionsSetup.sol";
 
 contract TestSetPermissionsFor_Local is JBPermissionsSetup {

package/test/units/static/JBPrices/JBPricesSetup.sol

@@ -1,7 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBPrices} from "../../../../src/JBPrices.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBPrices} from "../../../../src/interfaces/IJBPrices.sol";
+import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 /*

package/test/units/static/JBPrices/TestAddPriceFeedFor.sol

@@ -1,11 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBPrices} from "../../../../src/JBPrices.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBPriceFeed} from "../../../../src/interfaces/IJBPriceFeed.sol";
+import {IJBPrices} from "../../../../src/interfaces/IJBPrices.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
 import {JBPricesSetup} from "./JBPricesSetup.sol";
 
 contract TestAddPriceFeedFor_Local is JBPricesSetup {
     IJBPriceFeed _feed = IJBPriceFeed(makeAddr("feed"));
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 DEFAULT_PROJECT_ID = 0;
     uint256 _projectId = 1;
     address _projectOneOwner = makeAddr("oneOwner");

package/test/units/static/JBPrices/TestPricePerUnitOf.sol

@@ -1,11 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBPrices} from "../../../../src/JBPrices.sol";
+import {IJBPriceFeed} from "../../../../src/interfaces/IJBPriceFeed.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
 import {JBPricesSetup} from "./JBPricesSetup.sol";
 
 contract TestPricePerUnitOf_Local is JBPricesSetup {
     IJBPriceFeed _feed = IJBPriceFeed(makeAddr("priceFeed"));
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 DEFAULT_PROJECT_ID = 0;
     uint256 _projectId = 1;
     uint256 _defaultDirectPrice = 1_000_000_000;

package/test/units/static/JBPrices/TestPrices.sol

@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBPrices} from "../../../../src/JBPrices.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {mulDiv} from "@prb/math/src/Common.sol";
 import {JBPricesSetup} from "./JBPricesSetup.sol";
 import {MockPriceFeed} from "../../../mock/MockPriceFeed.sol";
 

package/test/units/static/JBProjects/JBProjectsSetup.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBProjects} from "../../../../src/JBProjects.sol";
+import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 /*

package/test/units/static/JBProjects/TestCreateFor.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {StdStorage, stdStorage} from "forge-std/StdStorage.sol";
+import {stdError} from "forge-std/StdError.sol";
+import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
 import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import {JBProjectsSetup} from "./JBProjectsSetup.sol";
 

package/test/units/static/JBProjects/TestInitialProject.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBProjects} from "../../../../src/JBProjects.sol";
+import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 contract TestInitialProject_Local is JBTest {

package/test/units/static/JBProjects/TestInterfaces.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
 import {JBProjectsSetup} from "./JBProjectsSetup.sol";
 
 contract TestSupportsInterface_Local is JBProjectsSetup {

package/test/units/static/JBProjects/TestSetResolver.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
+import {IJBTokenUriResolver} from "../../../../src/interfaces/IJBTokenUriResolver.sol";
 import {JBProjectsSetup} from "./JBProjectsSetup.sol";
 
 contract TestSetTokenURIResolver_Local is JBProjectsSetup {

package/test/units/static/JBProjects/TestTokenUri.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {StdStorage, stdStorage} from "forge-std/StdStorage.sol";
+import {IJBTokenUriResolver} from "../../../../src/interfaces/IJBTokenUriResolver.sol";
+import {IERC721Metadata} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol";
 import {JBProjectsSetup} from "./JBProjectsSetup.sol";
 
 contract TestTokenURI_Local is JBProjectsSetup {

package/test/units/static/JBRulesetMetadataResolver/TestSetCashOutTaxRateTo.sol

@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 contract TestSetCashOutTaxRateTo_Local is JBTest {
@@ -50,24 +53,29 @@ contract TestSetCashOutTaxRateTo_Local is JBTest {
         uint256 _packed = _rulesMetadata.packRulesetMetadata();
 
         // Reserved Rate
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint256 _reservedPercent = uint256(uint16(_packed >> 4));
 
         // Cash out tax rate
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint256 _cashOutTaxRate = uint256(uint16(_packed >> 20));
 
         assertEq(_reservedPercent, _fuzzReservedPercent);
         assertEq(_cashOutTaxRate, _fuzzCashOutTaxRate);
 
         for (uint256 _i = 68; _i < 81; _i++) {
+            // forge-lint: disable-next-line(unsafe-typecast)
             uint256 _flag = uint256(uint16(_packed >> _i) & 1);
             assertEq(_flag, 1);
         }
 
         // Data source address
+        // forge-lint: disable-next-line(unsafe-typecast)
         address _packedDataHook = address(uint160(_packed >> 82));
         assertEq(_packedDataHook, _hookAddress);
 
         // Metadata
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint256 _packedMetadata = uint256(uint16(_packed >> 242));
         assertEq(_packedMetadata, uint256(_fuzzMetadata));
     }

package/test/units/static/JBRulesets/JBRulesetsSetup.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBRulesets} from "../../../../src/JBRulesets.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 /*

package/test/units/static/JBRulesets/TestCurrentApprovalStatusForLatestRulesetOf.sol

@@ -1,7 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBApprovalStatus} from "../../../../src/enums/JBApprovalStatus.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBRulesetsSetup} from "./JBRulesetsSetup.sol";
 
 contract TestCurrentApprovalStatusForLatestRulesetOf_Local is JBRulesetsSetup {

package/test/units/static/JBRulesets/TestCurrentOf.sol

@@ -1,7 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBApprovalStatus} from "../../../../src/enums/JBApprovalStatus.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBRulesetsSetup} from "./JBRulesetsSetup.sol";
 
 contract TestCurrentOf_Local is JBRulesetsSetup {
@@ -79,6 +87,7 @@ contract TestCurrentOf_Local is JBRulesetsSetup {
         assertEq(_ruleset.id, 0);
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     modifier whenLatestRulesetIdDNEQZero() {
         // put code at hook address
         vm.etch(address(_mockApprovalHook), abi.encode(1));

package/test/units/static/JBRulesets/TestGetRulesetOf.sol

@@ -1,7 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
 import {JBRulesetsSetup} from "./JBRulesetsSetup.sol";
 
 contract TestGetRulesetOf_Local is JBRulesetsSetup {

package/test/units/static/JBRulesets/TestLatestQueuedRulesetOf.sol

@@ -1,7 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBApprovalStatus} from "../../../../src/enums/JBApprovalStatus.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBRulesetsSetup} from "./JBRulesetsSetup.sol";
 
 contract TestLatestQueuedRulesetOf_Local is JBRulesetsSetup {

package/test/units/static/JBRulesets/TestRulesets.sol

@@ -1,9 +1,19 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {stdError} from "forge-std/StdError.sol";
+import {JBRulesets} from "../../../../src/JBRulesets.sol";
+import {JBApprovalStatus} from "../../../../src/enums/JBApprovalStatus.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
-import {JBRulesetWeightCache} from "src/structs/JBRulesetWeightCache.sol";
 
 contract TestJBRulesetsUnits_Local is JBTest {
     // Contracts

package/test/units/static/JBRulesets/TestRulesetsOf.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
 import {JBRulesetsSetup} from "./JBRulesetsSetup.sol";
 
 contract TestRulesetsOf_Local is JBRulesetsSetup {

package/test/units/static/JBRulesets/TestUpcomingRulesetOf.sol

@@ -1,7 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBApprovalStatus} from "../../../../src/enums/JBApprovalStatus.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBRulesetsSetup} from "./JBRulesetsSetup.sol";
 
 contract TestUpcomingOf_Local is JBRulesetsSetup {
@@ -79,6 +87,7 @@ contract TestUpcomingOf_Local is JBRulesetsSetup {
         assertEq(_upcoming.id, 0);
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     modifier whenUpcomingRulesetIdDNEQZero() {
         // put code at hook address
         vm.etch(address(_mockApprovalHook), abi.encode(1));

package/test/units/static/JBRulesets/TestUpdateRulesetWeightCache.sol

@@ -1,7 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
 import {JBRulesetsSetup} from "./JBRulesetsSetup.sol";
 
 contract TestUpdateRulesetWeightCache_Local is JBRulesetsSetup {

package/test/units/static/JBSplits/JBSplitsSetup.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBSplits} from "../../../../src/JBSplits.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBSplits} from "../../../../src/interfaces/IJBSplits.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 /*

package/test/units/static/JBSplits/TestSelfManagedSplitGroups.sol

@@ -1,7 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBSplits} from "../../../../src/JBSplits.sol";
+import {JBControlled} from "../../../../src/abstract/JBControlled.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBSplitHook} from "../../../../src/interfaces/IJBSplitHook.sol";
+import {IJBSplits} from "../../../../src/interfaces/IJBSplits.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBSplit} from "../../../../src/structs/JBSplit.sol";
+import {JBSplitGroup} from "../../../../src/structs/JBSplitGroup.sol";
 import {JBSplitsSetup} from "./JBSplitsSetup.sol";
 
 contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {

package/test/units/static/JBSplits/TestSetSplitGroupsOf.sol

@@ -1,7 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBSplits} from "../../../../src/JBSplits.sol";
+import {JBControlled} from "../../../../src/abstract/JBControlled.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBSplitHook} from "../../../../src/interfaces/IJBSplitHook.sol";
+import {IJBSplits} from "../../../../src/interfaces/IJBSplits.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBSplit} from "../../../../src/structs/JBSplit.sol";
+import {JBSplitGroup} from "../../../../src/structs/JBSplitGroup.sol";
 import {JBSplitsSetup} from "./JBSplitsSetup.sol";
 
 contract TestSetSplitGroupsOf_Local is JBSplitsSetup {

package/test/units/static/JBSplits/TestSplitsLockedEdge.sol

@@ -1,7 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBSplits} from "../../../../src/JBSplits.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBSplitHook} from "../../../../src/interfaces/IJBSplitHook.sol";
+import {IJBSplits} from "../../../../src/interfaces/IJBSplits.sol";
+import {JBSplit} from "../../../../src/structs/JBSplit.sol";
+import {JBSplitGroup} from "../../../../src/structs/JBSplitGroup.sol";
 import {JBSplitsSetup} from "./JBSplitsSetup.sol";
 
 /// @notice Edge case tests for JBSplits lock enforcement.

package/test/units/static/JBSplits/TestSplitsOf.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBSplit} from "../../../../src/structs/JBSplit.sol";
 import {JBSplitsSetup} from "./JBSplitsSetup.sol";
 
 contract TestSplitsOf_Local is JBSplitsSetup {

package/test/units/static/JBSplits/TestSplitsPacking.sol

@@ -1,8 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import "src/JBSplits.sol";
-import "forge-std/Test.sol";
+import {JBSplits} from "src/JBSplits.sol";
+import {IJBDirectory} from "src/interfaces/IJBDirectory.sol";
+import {JBConstants} from "src/libraries/JBConstants.sol";
+import {JBSplit} from "src/structs/JBSplit.sol";
+import {Test} from "forge-std/Test.sol";
 
 contract TestSplitsPacking_Local is JBSplits, Test {
     constructor() JBSplits(IJBDirectory(address(0))) {}

package/test/units/static/JBSurplus/TestSurplusFuzz.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {ERC165, IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 import {JBSurplus} from "../../../../src/libraries/JBSurplus.sol";
 
@@ -53,7 +55,7 @@ contract MockSurplusTerminal is ERC165, IJBTerminal {
         override
     {}
 
-    function migrateBalanceOf(uint256, address, IJBTerminal) external override returns (uint256) {
+    function migrateBalanceOf(uint256, address, IJBTerminal) external pure override returns (uint256) {
         return 0;
     }
 

package/test/units/static/JBTerminalStore/JBTerminalStoreSetup.sol

@@ -1,7 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBTerminalStore} from "../../../../src/JBTerminalStore.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBPrices} from "../../../../src/interfaces/IJBPrices.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 /*

package/test/units/static/JBTerminalStore/TestCurrentReclaimableSurplusOf.sol

@@ -1,7 +1,20 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBController} from "../../../../src/interfaces/IJBController.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBFundAccessLimits} from "../../../../src/interfaces/IJBFundAccessLimits.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {IJBToken} from "../../../../src/interfaces/IJBToken.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {JBCurrencyAmount} from "../../../../src/structs/JBCurrencyAmount.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {mulDiv} from "@prb/math/src/Common.sol";
 import {JBTerminalStoreSetup} from "./JBTerminalStoreSetup.sol";
 import {JBCashOuts} from "../../../../src/libraries/JBCashOuts.sol";
 

package/test/units/static/JBTerminalStore/TestCurrentSurplusOf.sol

@@ -1,7 +1,20 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBController} from "../../../../src/interfaces/IJBController.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBFundAccessLimits} from "../../../../src/interfaces/IJBFundAccessLimits.sol";
+import {IJBPrices} from "../../../../src/interfaces/IJBPrices.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {IJBToken} from "../../../../src/interfaces/IJBToken.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {JBCurrencyAmount} from "../../../../src/structs/JBCurrencyAmount.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
 import {JBTerminalStoreSetup} from "./JBTerminalStoreSetup.sol";
 
 contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {

package/test/units/static/JBTerminalStore/TestCurrentTotalSurplusOf.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
 import {JBTerminalStoreSetup} from "./JBTerminalStoreSetup.sol";
 
 contract TestCurrentTotalSurplusOf_Local is JBTerminalStoreSetup {