@bananapus/core-v6 0.0.15 → 0.0.16

package/test/invariants/handlers/TerminalStoreHandler.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.6;
 
-import "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 import {JBConstants} from "../../../src/libraries/JBConstants.sol";
 import {IJBMultiTerminal} from "../../../src/interfaces/IJBMultiTerminal.sol";
 import {IJBTerminalStore} from "../../../src/interfaces/IJBTerminalStore.sol";
@@ -20,9 +20,13 @@ contract TerminalStoreHandler is Test {
     address public projectOwner;
 
     // Ghost variables for fund tracking
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public ghost_totalPaidIn;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public ghost_totalCashedOut;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public ghost_totalPaidOut;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public ghost_totalAddedToBalance;
 
     // Track actors
@@ -47,6 +51,7 @@ contract TerminalStoreHandler is Test {
 
         // Create actor addresses
         for (uint256 i = 0; i < NUM_ACTORS; i++) {
+            // forge-lint: disable-next-line(unsafe-typecast)
             address actor = address(uint160(0x1000 + i));
             actors.push(actor);
             isActor[actor] = true;

package/test/invariants/handlers/TokensHandler.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.6;
 
-import "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 import {JBConstants} from "../../../src/libraries/JBConstants.sol";
 import {IJBMultiTerminal} from "../../../src/interfaces/IJBMultiTerminal.sol";
 import {IJBController} from "../../../src/interfaces/IJBController.sol";

package/test/mock/MockERC20.sol

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../helpers/TestBaseWorkflow.sol";
-
 import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract MockERC20 is ERC20 {

package/test/mock/MockMaliciousBeneficiary.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../helpers/TestBaseWorkflow.sol";
+import {Test} from "forge-std/Test.sol";
+import {JBTerminalStore} from "../../src/JBTerminalStore.sol";
 import {IJBMultiTerminal} from "../../src/interfaces/IJBMultiTerminal.sol";
 import {JBConstants} from "../../src/libraries/JBConstants.sol";
 import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";

package/test/mock/MockMaliciousSplitHook.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../helpers/TestBaseWorkflow.sol";
+import {IJBSplitHook} from "../../src/interfaces/IJBSplitHook.sol";
+import {JBSplitHookContext} from "../../src/structs/JBSplitHookContext.sol";
 
 import {ERC165, IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 

package/test/mock/MockPriceFeed.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../helpers/TestBaseWorkflow.sol";
+import {IJBPriceFeed} from "../../src/interfaces/IJBPriceFeed.sol";
 
 contract MockPriceFeed is IJBPriceFeed {
     uint256 public fakePrice;

package/test/units/static/JBChainlinkV3PriceFeed/TestPriceFeed.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 import {JBChainlinkV3PriceFeed} from "../../../../src/JBChainlinkV3PriceFeed.sol";
 import {AggregatorV3Interface} from "@chainlink/contracts/src/v0.8/shared/interfaces/AggregatorV3Interface.sol";

package/test/units/static/JBController/JBControllerSetup.sol

@@ -1,7 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBController} from "../../../../src/JBController.sol";
+import {IJBController} from "../../../../src/interfaces/IJBController.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBFundAccessLimits} from "../../../../src/interfaces/IJBFundAccessLimits.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 {IJBSplits} from "../../../../src/interfaces/IJBSplits.sol";
+import {IJBTokens} from "../../../../src/interfaces/IJBTokens.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 /*

package/test/units/static/JBController/TestBurnTokensOf.sol

@@ -1,7 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBController} from "../../../../src/JBController.sol";
+import {JBPermissioned} from "../../../../src/abstract/JBPermissioned.sol";
+import {IJBController} from "../../../../src/interfaces/IJBController.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {IJBTokens} from "../../../../src/interfaces/IJBTokens.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
 import {JBControllerSetup} from "./JBControllerSetup.sol";
 
 contract TestBurnTokensOf_Local is JBControllerSetup {

package/test/units/static/JBController/TestClaimTokensFor.sol

@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBPermissioned} from "../../../../src/abstract/JBPermissioned.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBTokens} from "../../../../src/interfaces/IJBTokens.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
 import {JBControllerSetup} from "./JBControllerSetup.sol";
 
 contract TestClaimTokensFor_Local is JBControllerSetup {

package/test/units/static/JBController/TestDeployErc20For.sol

@@ -1,7 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBPermissioned} from "../../../../src/abstract/JBPermissioned.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBToken} from "../../../../src/interfaces/IJBToken.sol";
+import {IJBTokens} from "../../../../src/interfaces/IJBTokens.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {JBControllerSetup} from "./JBControllerSetup.sol";
 
 contract TestDeployERC20For_Local is JBControllerSetup {
@@ -34,6 +39,7 @@ contract TestDeployERC20For_Local is JBControllerSetup {
     function test_WhenCallerIsPermissionedAndSaltIsNonZero() external {
         // it will deploy ERC20 and return IJBToken
 
+        // forge-lint: disable-next-line(unsafe-typecast)
         bytes32 _nonZeroSalt = bytes32("somesalt");
         bytes32 _encodedSalt = keccak256(abi.encodePacked(address(this), _nonZeroSalt));
 

package/test/units/static/JBController/TestLaunchProjectFor.sol

@@ -1,7 +1,27 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBController} from "../../../../src/JBController.sol";
+import {IJBController} from "../../../../src/interfaces/IJBController.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBFundAccessLimits} from "../../../../src/interfaces/IJBFundAccessLimits.sol";
+import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBSplitHook} from "../../../../src/interfaces/IJBSplitHook.sol";
+import {IJBSplits} from "../../../../src/interfaces/IJBSplits.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {JBFundAccessLimitGroup} from "../../../../src/structs/JBFundAccessLimitGroup.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetConfig} from "../../../../src/structs/JBRulesetConfig.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {JBSplit} from "../../../../src/structs/JBSplit.sol";
+import {JBSplitGroup} from "../../../../src/structs/JBSplitGroup.sol";
+import {JBTerminalConfig} from "../../../../src/structs/JBTerminalConfig.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBControllerSetup} from "./JBControllerSetup.sol";
 
 contract TestLaunchProjectFor_Local is JBControllerSetup {

package/test/units/static/JBController/TestLaunchRulesetsFor.sol

@@ -1,7 +1,27 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBController} from "../../../../src/JBController.sol";
+import {JBPermissioned} from "../../../../src/abstract/JBPermissioned.sol";
+import {IJBController} from "../../../../src/interfaces/IJBController.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBFundAccessLimits} from "../../../../src/interfaces/IJBFundAccessLimits.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBSplits} from "../../../../src/interfaces/IJBSplits.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBCurrencyAmount} from "../../../../src/structs/JBCurrencyAmount.sol";
+import {JBFundAccessLimitGroup} from "../../../../src/structs/JBFundAccessLimitGroup.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetConfig} from "../../../../src/structs/JBRulesetConfig.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {JBSplitGroup} from "../../../../src/structs/JBSplitGroup.sol";
+import {JBTerminalConfig} from "../../../../src/structs/JBTerminalConfig.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBControllerSetup} from "./JBControllerSetup.sol";
 
 contract TestLaunchRulesetsFor_Local is JBControllerSetup {

package/test/units/static/JBController/TestMigrateController.sol

@@ -1,7 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {StdStorage, stdStorage} from "forge-std/StdStorage.sol";
+import {JBController} from "../../../../src/JBController.sol";
+import {IJBMigratable} from "../../../../src/interfaces/IJBMigratable.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 {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {JBControllerSetup} from "./JBControllerSetup.sol";
 
 contract TestMigrateController_Local is JBControllerSetup {

package/test/units/static/JBController/TestMintTokensOfUnits.sol

@@ -1,7 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBController} from "../../../../src/JBController.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.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 {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {JBControllerSetup} from "./JBControllerSetup.sol";
 
 contract TestMintTokensOfUnits_Local is JBControllerSetup {

package/test/units/static/JBController/TestPayReservedTokenToTerminal.sol

@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBController} from "../../../../src/JBController.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {IJBToken} from "../../../../src/interfaces/IJBToken.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {JBControllerSetup} from "./JBControllerSetup.sol";
 
 contract TestExecutePayReservedTokenToTerminal_Local is JBControllerSetup {

package/test/units/static/JBController/TestReceiveMigrationFrom.sol

@@ -1,7 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBController} from "../../../../src/JBController.sol";
+import {IJBController} from "../../../../src/interfaces/IJBController.sol";
+import {IJBMigratable} from "../../../../src/interfaces/IJBMigratable.sol";
+import {IJBProjectUriRegistry} from "../../../../src/interfaces/IJBProjectUriRegistry.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBControllerSetup} from "./JBControllerSetup.sol";
 
 contract TestReceiveMigrationFrom_Local is JBControllerSetup {

package/test/units/static/JBController/TestRulesetViews.sol

@@ -1,7 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBApprovalStatus} from "../../../../src/enums/JBApprovalStatus.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {JBRulesetWithMetadata} from "../../../../src/structs/JBRulesetWithMetadata.sol";
 import {JBControllerSetup} from "./JBControllerSetup.sol";
 
 /**

package/test/units/static/JBController/TestSendReservedTokensToSplitsOf.sol

@@ -1,7 +1,27 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {StdStorage, stdStorage} from "forge-std/StdStorage.sol";
+import {JBController} from "../../../../src/JBController.sol";
+import {IJBController} from "../../../../src/interfaces/IJBController.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBSplitHook} from "../../../../src/interfaces/IJBSplitHook.sol";
+import {IJBSplits} from "../../../../src/interfaces/IJBSplits.sol";
+import {IJBToken} from "../../../../src/interfaces/IJBToken.sol";
+import {IJBTokens} from "../../../../src/interfaces/IJBTokens.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBFundAccessLimitGroup} from "../../../../src/structs/JBFundAccessLimitGroup.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetConfig} from "../../../../src/structs/JBRulesetConfig.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {JBSplit} from "../../../../src/structs/JBSplit.sol";
+import {JBSplitGroup} from "../../../../src/structs/JBSplitGroup.sol";
+import {JBSplitHookContext} from "../../../../src/structs/JBSplitHookContext.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {JBControllerSetup} from "./JBControllerSetup.sol";
 
 contract TestSendReservedTokensToSplitsOf_Local is JBControllerSetup {

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

@@ -1,7 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBPermissioned} from "../../../../src/abstract/JBPermissioned.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBSplits} from "../../../../src/interfaces/IJBSplits.sol";
+import {JBSplitGroup} from "../../../../src/structs/JBSplitGroup.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {JBControllerSetup} from "./JBControllerSetup.sol";
 
 contract TestSetSplitGroupsOf_Local is JBControllerSetup {

package/test/units/static/JBController/TestSetTokenFor.sol

@@ -1,7 +1,19 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBController} from "../../../../src/JBController.sol";
+import {JBPermissioned} from "../../../../src/abstract/JBPermissioned.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBToken} from "../../../../src/interfaces/IJBToken.sol";
+import {IJBTokens} from "../../../../src/interfaces/IJBTokens.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 {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {JBControllerSetup} from "./JBControllerSetup.sol";
 
 contract TestSetTokenFor_Local is JBControllerSetup {

package/test/units/static/JBController/TestSetUriOf.sol

@@ -1,7 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBPermissioned} from "../../../../src/abstract/JBPermissioned.sol";
+import {IJBController} from "../../../../src/interfaces/IJBController.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {JBControllerSetup} from "./JBControllerSetup.sol";
 
 contract TestSetUriOf_Local is JBControllerSetup {

package/test/units/static/JBController/TestTransferCreditsFrom.sol

@@ -1,7 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBController} from "../../../../src/JBController.sol";
+import {JBPermissioned} from "../../../../src/abstract/JBPermissioned.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBTokens} from "../../../../src/interfaces/IJBTokens.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 {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
 import {JBControllerSetup} from "./JBControllerSetup.sol";
 
 contract TestTransferCreditsFrom_Local is JBControllerSetup {

package/test/units/static/JBDeadline/TestDeadlineFuzz.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 import {JBDeadline} from "../../../../src/JBDeadline.sol";
 import {JBApprovalStatus} from "../../../../src/enums/JBApprovalStatus.sol";
@@ -47,7 +48,9 @@ contract TestDeadlineFuzz_Local is JBTest {
 
     /// @notice Ruleset queued too close to start returns Failed.
     function test_insufficientGap_isFailed() external view {
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint48 start = uint48(block.timestamp + 1 days);
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint48 queued = start - uint48(DURATION) + 1; // 1 second short of required gap
 
         JBRuleset memory ruleset = _makeRuleset({queuedAt: queued, start: start});
@@ -58,7 +61,9 @@ contract TestDeadlineFuzz_Local is JBTest {
     /// @notice Ruleset with exactly enough gap and deadline not yet passed returns ApprovalExpected.
     function test_exactGap_deadlineNotPassed_isApprovalExpected() external view {
         // queue far enough in advance, and start is still far in the future
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint48 start = uint48(block.timestamp + 2 * DURATION + 100);
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint48 queued = start - uint48(DURATION);
 
         JBRuleset memory ruleset = _makeRuleset({queuedAt: queued, start: start});
@@ -68,7 +73,9 @@ contract TestDeadlineFuzz_Local is JBTest {
 
     /// @notice Ruleset with enough gap and deadline passed returns Approved.
     function test_gapSufficient_deadlinePassed_isApproved() external view {
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint48 start = uint48(block.timestamp + 1); // start is very soon
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint48 queued = start - uint48(DURATION) - 1; // plenty of gap
 
         JBRuleset memory ruleset = _makeRuleset({queuedAt: queued, start: start});
@@ -123,7 +130,9 @@ contract TestDeadlineFuzz_Local is JBTest {
 
         // Warp to a timestamp large enough so that start >= gap always holds.
         vm.warp(gap + 1);
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint48 start = uint48(block.timestamp);
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint48 queuedAt = start - uint48(gap);
 
         JBRuleset memory ruleset = _makeRuleset({queuedAt: queuedAt, start: start});
@@ -166,7 +175,9 @@ contract TestDeadlineFuzz_Local is JBTest {
         // Ensure block.timestamp >= duration to avoid underflow.
         vm.warp(duration + 1);
 
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint48 start = uint48(block.timestamp + 1);
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint48 queuedAt = uint48(block.timestamp - duration);
 
         JBRuleset memory ruleset = _makeRuleset({queuedAt: queuedAt, start: start});

package/test/units/static/JBDirectory/JBDirectorySetup.sol

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

package/test/units/static/JBDirectory/TestPrimaryTerminalOf.sol

@@ -1,7 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBDirectoryAccessControl} from "../../../../src/interfaces/IJBDirectoryAccessControl.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBDirectorySetup} from "./JBDirectorySetup.sol";
 
 contract TestPrimaryTerminalOf_Local is JBDirectorySetup {

package/test/units/static/JBDirectory/TestSetControllerOf.sol

@@ -1,7 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {StdStorage, stdStorage} from "forge-std/StdStorage.sol";
+import {JBDirectory} from "../../../../src/JBDirectory.sol";
+import {JBPermissioned} from "../../../../src/abstract/JBPermissioned.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBDirectoryAccessControl} from "../../../../src/interfaces/IJBDirectoryAccessControl.sol";
+import {IJBMigratable} from "../../../../src/interfaces/IJBMigratable.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBDirectorySetup} from "./JBDirectorySetup.sol";
 
 contract TestSetControllerOf_Local is JBDirectorySetup {

package/test/units/static/JBDirectory/TestSetControllerOfMigrationOrder.sol

@@ -1,7 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {StdStorage, stdStorage} from "forge-std/StdStorage.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBDirectoryAccessControl} from "../../../../src/interfaces/IJBDirectoryAccessControl.sol";
+import {IJBMigratable} from "../../../../src/interfaces/IJBMigratable.sol";
+import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+import {ERC165, IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBDirectorySetup} from "./JBDirectorySetup.sol";
 
 /// @notice A mock controller that asserts the directory still points to it during migrate().

package/test/units/static/JBDirectory/TestSetPrimaryTerminalOf.sol

@@ -1,7 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {StdStorage, stdStorage} from "forge-std/StdStorage.sol";
+import {JBDirectory} from "../../../../src/JBDirectory.sol";
+import {JBPermissioned} from "../../../../src/abstract/JBPermissioned.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBDirectoryAccessControl} from "../../../../src/interfaces/IJBDirectoryAccessControl.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBDirectorySetup} from "./JBDirectorySetup.sol";
 
 contract TestSetPrimaryTerminalOf_Local is JBDirectorySetup {

package/test/units/static/JBDirectory/TestSetTerminalsOf.sol

@@ -1,7 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {StdStorage, stdStorage} from "forge-std/StdStorage.sol";
+import {JBDirectory} from "../../../../src/JBDirectory.sol";
+import {JBPermissioned} from "../../../../src/abstract/JBPermissioned.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBDirectoryAccessControl} from "../../../../src/interfaces/IJBDirectoryAccessControl.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBDirectorySetup} from "./JBDirectorySetup.sol";
 
 contract TestSetTerminalsOf_Local is JBDirectorySetup {

package/test/units/static/JBERC20/JBERC20Setup.sol

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

package/test/units/static/JBERC20/SigUtils.sol

@@ -2,8 +2,10 @@
 pragma solidity 0.8.26;
 
 contract SigUtils {
+    // forge-lint: disable-next-line(mixed-case-variable)
     bytes32 internal DOMAIN_SEPARATOR;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     constructor(bytes32 _DOMAIN_SEPARATOR) {
         DOMAIN_SEPARATOR = _DOMAIN_SEPARATOR;
     }

package/test/units/static/JBERC20/TestInitialize.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {JBERC20Setup} from "./JBERC20Setup.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";