@bananapus/core-v6 0.0.36 → 0.0.38

package/test/units/static/JBFundAccessLimits/JBFundAccessSetup.sol

@@ -1,24 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-import {JBFundAccessLimits} from "../../../../src/JBFundAccessLimits.sol";
-import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
-import {IJBFundAccessLimits} from "../../../../src/interfaces/IJBFundAccessLimits.sol";
-import {JBTest} from "../../../helpers/JBTest.sol";
-
-/*
-Contract that deploys a target contract with other mock contracts to satisfy the constructor.
-Tests relative to this contract will be dependent on mock calls/emits and stdStorage.
-*/
-contract JBFundAccessSetup is JBTest {
-    // Target Contract
-    IJBFundAccessLimits public _fundAccess;
-
-    // Mocks
-    IJBDirectory public directory = IJBDirectory(makeAddr("directory"));
-
-    function fundAccessSetup() public virtual {
-        // Instantiate the contract being tested
-        _fundAccess = new JBFundAccessLimits(directory);
-    }
-}

package/test/units/static/JBFundAccessLimits/TestFundAccessLimitsEdge.sol

@@ -1,163 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-import {JBFundAccessLimits} from "../../../../src/JBFundAccessLimits.sol";
-import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
-import {JBCurrencyAmount} from "../../../../src/structs/JBCurrencyAmount.sol";
-import {JBFundAccessLimitGroup} from "../../../../src/structs/JBFundAccessLimitGroup.sol";
-import {JBTest} from "../../../helpers/JBTest.sol";
-
-/// @notice Edge case tests for JBFundAccessLimits append behavior and packing.
-/// The key finding is that setFundAccessLimitsFor uses .push() (append), not replace.
-/// If called twice for the same rulesetId, limits accumulate rather than being replaced.
-contract TestFundAccessLimitsEdge_Local is JBTest {
-    IJBDirectory public directory = IJBDirectory(makeAddr("directory"));
-    JBFundAccessLimits public limits;
-
-    uint256 constant PROJECT_ID = 1;
-    uint256 constant RULESET_ID = 100;
-    address constant TERMINAL = address(0xBEEF);
-    address constant TOKEN = address(0xCAFE);
-
-    function setUp() public {
-        limits = new JBFundAccessLimits(directory);
-
-        // Mock controllerOf to return this contract (so we can call setFundAccessLimitsFor).
-        vm.mockCall(
-            address(directory), abi.encodeCall(IJBDirectory.controllerOf, (PROJECT_ID)), abi.encode(address(this))
-        );
-    }
-
-    // ───────────────────── Append-not-replace bug
-    // ─────────────────────
-
-    /// @notice BUG: Calling setFundAccessLimitsFor twice accumulates limits instead of replacing.
-    /// If a controller ever calls this twice for the same rulesetId (e.g., custom controller,
-    /// reentrancy, or migration bug), limits double.
-    function test_doubleSetting_accumulatesLimits() external {
-        JBCurrencyAmount[] memory payoutLimits = new JBCurrencyAmount[](1);
-        payoutLimits[0] = JBCurrencyAmount({amount: 1000, currency: 1});
-
-        JBFundAccessLimitGroup[] memory groups = new JBFundAccessLimitGroup[](1);
-        groups[0] = JBFundAccessLimitGroup({
-            terminal: TERMINAL, token: TOKEN, payoutLimits: payoutLimits, surplusAllowances: new JBCurrencyAmount[](0)
-        });
-
-        // First call — sets limit to 1000.
-        limits.setFundAccessLimitsFor(PROJECT_ID, RULESET_ID, groups);
-
-        // Verify first limit.
-        uint256 limit1 = limits.payoutLimitOf(PROJECT_ID, RULESET_ID, TERMINAL, TOKEN, 1);
-        assertEq(limit1, 1000, "First limit should be 1000");
-
-        // Second call with SAME rulesetId — BUG: this APPENDS, not replaces.
-        limits.setFundAccessLimitsFor(PROJECT_ID, RULESET_ID, groups);
-
-        // Query all limits — should have 2 entries now (both with currency=1, amount=1000).
-        JBCurrencyAmount[] memory allLimits = limits.payoutLimitsOf(PROJECT_ID, RULESET_ID, TERMINAL, TOKEN);
-
-        // Two entries instead of one.
-        assertEq(allLimits.length, 2, "BUG: Limits accumulated instead of being replaced");
-        assertEq(allLimits[0].amount, 1000, "First accumulated limit");
-        assertEq(allLimits[1].amount, 1000, "Second accumulated limit");
-
-        // The payoutLimitOf function returns the FIRST match, so it still returns 1000.
-        // But the surplus calculation iterates ALL limits, effectively doubling the payout limit.
-        uint256 limitQuery = limits.payoutLimitOf(PROJECT_ID, RULESET_ID, TERMINAL, TOKEN, 1);
-        assertEq(limitQuery, 1000, "Query returns first match only");
-    }
-
-    // ───────────────────── Zero amount skipped
-    // ─────────────────────
-
-    /// @notice Zero-amount limits are not stored (filtered by amount > 0 check).
-    function test_zeroAmount_skipped() external {
-        JBCurrencyAmount[] memory payoutLimits = new JBCurrencyAmount[](2);
-        payoutLimits[0] = JBCurrencyAmount({amount: 0, currency: 1}); // Should be skipped.
-        payoutLimits[1] = JBCurrencyAmount({amount: 500, currency: 2});
-
-        JBFundAccessLimitGroup[] memory groups = new JBFundAccessLimitGroup[](1);
-        groups[0] = JBFundAccessLimitGroup({
-            terminal: TERMINAL, token: TOKEN, payoutLimits: payoutLimits, surplusAllowances: new JBCurrencyAmount[](0)
-        });
-
-        limits.setFundAccessLimitsFor(PROJECT_ID, RULESET_ID, groups);
-
-        // Only the non-zero limit should be stored.
-        JBCurrencyAmount[] memory allLimits = limits.payoutLimitsOf(PROJECT_ID, RULESET_ID, TERMINAL, TOKEN);
-        assertEq(allLimits.length, 1, "Zero-amount limit should not be stored");
-        assertEq(allLimits[0].amount, 500, "Only non-zero limit stored");
-        assertEq(allLimits[0].currency, 2, "Correct currency stored");
-    }
-
-    // ───────────────────── Currency ordering validation
-    // ─────────────────────
-
-    /// @notice Duplicate currencies in payout limits should revert.
-    function test_currencyOrdering_rejectsEqual() external {
-        JBCurrencyAmount[] memory payoutLimits = new JBCurrencyAmount[](2);
-        payoutLimits[0] = JBCurrencyAmount({amount: 100, currency: 1});
-        payoutLimits[1] = JBCurrencyAmount({amount: 200, currency: 1}); // Same currency!
-
-        JBFundAccessLimitGroup[] memory groups = new JBFundAccessLimitGroup[](1);
-        groups[0] = JBFundAccessLimitGroup({
-            terminal: TERMINAL, token: TOKEN, payoutLimits: payoutLimits, surplusAllowances: new JBCurrencyAmount[](0)
-        });
-
-        vm.expectRevert(JBFundAccessLimits.JBFundAccessLimits_InvalidPayoutLimitCurrencyOrdering.selector);
-        limits.setFundAccessLimitsFor(PROJECT_ID, RULESET_ID, groups);
-    }
-
-    /// @notice Descending currency order should revert.
-    function test_currencyOrdering_rejectsDescending() external {
-        JBCurrencyAmount[] memory payoutLimits = new JBCurrencyAmount[](2);
-        payoutLimits[0] = JBCurrencyAmount({amount: 100, currency: 2});
-        payoutLimits[1] = JBCurrencyAmount({amount: 200, currency: 1}); // Descending!
-
-        JBFundAccessLimitGroup[] memory groups = new JBFundAccessLimitGroup[](1);
-        groups[0] = JBFundAccessLimitGroup({
-            terminal: TERMINAL, token: TOKEN, payoutLimits: payoutLimits, surplusAllowances: new JBCurrencyAmount[](0)
-        });
-
-        vm.expectRevert(JBFundAccessLimits.JBFundAccessLimits_InvalidPayoutLimitCurrencyOrdering.selector);
-        limits.setFundAccessLimitsFor(PROJECT_ID, RULESET_ID, groups);
-    }
-
-    // ───────────────────── Packing round-trip
-    // ─────────────────────
-
-    /// @notice Fuzz: packed amount + currency unpack correctly for all inputs.
-    function testFuzz_packingRoundTrip(uint224 amount, uint32 currency) external {
-        // Skip zero amounts (they're filtered out).
-        vm.assume(amount > 0);
-        // Skip currency 0 since ordering requires > 0 for the first element.
-        vm.assume(currency > 0);
-
-        JBCurrencyAmount[] memory payoutLimits = new JBCurrencyAmount[](1);
-        payoutLimits[0] = JBCurrencyAmount({amount: amount, currency: currency});
-
-        JBFundAccessLimitGroup[] memory groups = new JBFundAccessLimitGroup[](1);
-        groups[0] = JBFundAccessLimitGroup({
-            terminal: TERMINAL, token: TOKEN, payoutLimits: payoutLimits, surplusAllowances: new JBCurrencyAmount[](0)
-        });
-
-        // Use a unique rulesetId for each fuzz run to avoid accumulation bug.
-        uint256 rulesetId = uint256(keccak256(abi.encode(amount, currency)));
-        limits.setFundAccessLimitsFor(PROJECT_ID, rulesetId, groups);
-
-        // Verify round-trip.
-        JBCurrencyAmount[] memory result = limits.payoutLimitsOf(PROJECT_ID, rulesetId, TERMINAL, TOKEN);
-        assertEq(result.length, 1, "Should have exactly one limit");
-        assertEq(result[0].amount, amount, "Amount should round-trip correctly");
-        assertEq(result[0].currency, currency, "Currency should round-trip correctly");
-    }
-
-    // ───────────────────── Query nonexistent returns zero
-    // ─────────────────────
-
-    /// @notice Querying a currency with no limit returns 0 (implicit default).
-    function test_queryNonexistentCurrency_returnsZero() external view {
-        uint256 limit = limits.payoutLimitOf(PROJECT_ID, RULESET_ID, TERMINAL, TOKEN, 999);
-        assertEq(limit, 0, "Nonexistent currency should return 0");
-    }
-}

package/test/units/static/JBFundAccessLimits/TestPayoutLimitOf.sol

@@ -1,59 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
-import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
-import {JBCurrencyAmount} from "../../../../src/structs/JBCurrencyAmount.sol";
-import {JBFundAccessLimitGroup} from "../../../../src/structs/JBFundAccessLimitGroup.sol";
-import {JBFundAccessSetup} from "./JBFundAccessSetup.sol";
-
-contract TestPayoutLimitOf_Local is JBFundAccessSetup {
-    uint256 _projectId = 1;
-    uint256 _ruleset = block.timestamp;
-    uint224 _payoutLimit = 1e18;
-    uint32 _currency = uint32(uint160(JBConstants.NATIVE_TOKEN));
-    address _terminal = address(1);
-    address _token = JBConstants.NATIVE_TOKEN;
-
-    function setUp() public {
-        super.fundAccessSetup();
-
-        // Fund Access config
-        JBFundAccessLimitGroup[] memory _fundAccessLimitGroup = new JBFundAccessLimitGroup[](1);
-        {
-            // Specify a payout limit.
-            JBCurrencyAmount[] memory _payoutLimits = new JBCurrencyAmount[](1);
-            _payoutLimits[0] =
-                JBCurrencyAmount({amount: _payoutLimit, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))});
-
-            // Specify a surplus allowance.
-            JBCurrencyAmount[] memory _surplusAllowances = new JBCurrencyAmount[](0);
-
-            _fundAccessLimitGroup[0] = JBFundAccessLimitGroup({
-                terminal: address(_terminal),
-                token: JBConstants.NATIVE_TOKEN,
-                payoutLimits: _payoutLimits,
-                surplusAllowances: _surplusAllowances
-            });
-        }
-
-        bytes memory _controllerCall = abi.encodeCall(IJBDirectory.controllerOf, (1));
-        bytes memory _return = abi.encode(address(this));
-
-        mockExpect(address(directory), _controllerCall, _return);
-
-        _fundAccess.setFundAccessLimitsFor(_projectId, _ruleset, _fundAccessLimitGroup);
-    }
-
-    function test_WhenTheProjectHasTheSpecificPayoutLimit() external view {
-        // it will return the uint256 payoutLimit
-        uint256 _returnedLimit = _fundAccess.payoutLimitOf(_projectId, _ruleset, _terminal, _token, _currency);
-        assertEq(_returnedLimit, _payoutLimit);
-    }
-
-    function test_WhenTheProjectDoesntHaveTheSpecificPayoutLimit() external view {
-        // it will return 0
-        uint256 empty = _fundAccess.payoutLimitOf(1, 1, address(1), address(2), 1);
-        assertEq(empty, 0);
-    }
-}

package/test/units/static/JBFundAccessLimits/TestPayoutLimitsOf.sol

@@ -1,101 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
-import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
-import {JBCurrencyAmount} from "../../../../src/structs/JBCurrencyAmount.sol";
-import {JBFundAccessLimitGroup} from "../../../../src/structs/JBFundAccessLimitGroup.sol";
-import {JBFundAccessSetup} from "./JBFundAccessSetup.sol";
-
-contract TestPayoutLimitsOf_Local is JBFundAccessSetup {
-    uint256 _projectId = 1;
-    uint256 _ruleset = block.timestamp;
-    uint224 _payoutLimit = 1e18;
-    uint224 _payoutLimit2 = 1e6;
-    uint32 _currency = uint32(uint160(JBConstants.NATIVE_TOKEN));
-    address _terminal = address(1);
-    address _terminal2 = address(2);
-    address _someToken = makeAddr("sometoken");
-
-    function setUp() public {
-        super.fundAccessSetup();
-    }
-
-    modifier whenAProjectHasPayoutLimits() {
-        // Fund Access config
-        JBFundAccessLimitGroup[] memory _fundAccessLimitGroup = new JBFundAccessLimitGroup[](2);
-        {
-            // Specify a payout limit.
-            JBCurrencyAmount[] memory _payoutLimits = new JBCurrencyAmount[](2);
-            _payoutLimits[0] =
-                JBCurrencyAmount({amount: _payoutLimit, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))});
-
-            // Specify a second payout limit.
-            // forge-lint: disable-next-line(unsafe-typecast)
-            _payoutLimits[1] = JBCurrencyAmount({amount: _payoutLimit2, currency: uint32(uint160(_someToken))});
-
-            // Specify a surplus allowance.
-            JBCurrencyAmount[] memory _surplusAllowances = new JBCurrencyAmount[](0);
-
-            _fundAccessLimitGroup[0] = JBFundAccessLimitGroup({
-                terminal: address(_terminal),
-                token: JBConstants.NATIVE_TOKEN,
-                payoutLimits: _payoutLimits,
-                surplusAllowances: _surplusAllowances
-            });
-
-            _fundAccessLimitGroup[1] = JBFundAccessLimitGroup({
-                terminal: address(_terminal2),
-                token: JBConstants.NATIVE_TOKEN,
-                payoutLimits: _payoutLimits,
-                surplusAllowances: _surplusAllowances
-            });
-        }
-
-        bytes memory _controllerCall = abi.encodeCall(IJBDirectory.controllerOf, (1));
-        bytes memory _return = abi.encode(address(this));
-
-        mockExpect(address(directory), _controllerCall, _return);
-
-        _fundAccess.setFundAccessLimitsFor(_projectId, _ruleset, _fundAccessLimitGroup);
-        _fundAccess.setFundAccessLimitsFor(_projectId, _ruleset + 1, _fundAccessLimitGroup);
-        _;
-    }
-
-    function test_GivenTheyAreConfiguredForASpecificToken() external whenAProjectHasPayoutLimits {
-        // it will return them
-
-        JBCurrencyAmount[] memory payoutLimits =
-            _fundAccess.payoutLimitsOf(_projectId, _ruleset, _terminal, JBConstants.NATIVE_TOKEN);
-
-        assertEq(payoutLimits[0].currency, uint32(uint160(JBConstants.NATIVE_TOKEN)));
-        assertEq(payoutLimits[0].amount, _payoutLimit);
-        // forge-lint: disable-next-line(unsafe-typecast)
-        assertEq(payoutLimits[1].currency, uint32(uint160(_someToken)));
-        assertEq(payoutLimits[1].amount, _payoutLimit2);
-    }
-
-    function test_GivenTheyAreConfiguredForASpecificTerminal() external whenAProjectHasPayoutLimits {
-        // it will return them
-        JBCurrencyAmount[] memory payoutLimits =
-            _fundAccess.payoutLimitsOf(_projectId, _ruleset, _terminal2, JBConstants.NATIVE_TOKEN);
-
-        assertEq(payoutLimits[0].currency, uint32(uint160(JBConstants.NATIVE_TOKEN)));
-        assertEq(payoutLimits[0].amount, _payoutLimit);
-        // forge-lint: disable-next-line(unsafe-typecast)
-        assertEq(payoutLimits[1].currency, uint32(uint160(_someToken)));
-        assertEq(payoutLimits[1].amount, _payoutLimit2);
-    }
-
-    function test_GivenTheyAreConfiguredForASpecificRulesetId() external whenAProjectHasPayoutLimits {
-        // it will return them
-        JBCurrencyAmount[] memory payoutLimits =
-            _fundAccess.payoutLimitsOf(_projectId, _ruleset + 1, _terminal2, JBConstants.NATIVE_TOKEN);
-
-        assertEq(payoutLimits[0].currency, uint32(uint160(JBConstants.NATIVE_TOKEN)));
-        assertEq(payoutLimits[0].amount, _payoutLimit);
-        // forge-lint: disable-next-line(unsafe-typecast)
-        assertEq(payoutLimits[1].currency, uint32(uint160(_someToken)));
-        assertEq(payoutLimits[1].amount, _payoutLimit2);
-    }
-}

package/test/units/static/JBFundAccessLimits/TestSetFundAccessLimitsFor.sol

@@ -1,189 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-import {JBFundAccessLimits} from "../../../../src/JBFundAccessLimits.sol";
-import {JBControlled} from "../../../../src/abstract/JBControlled.sol";
-import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
-import {IJBFundAccessLimits} from "../../../../src/interfaces/IJBFundAccessLimits.sol";
-import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
-import {JBCurrencyAmount} from "../../../../src/structs/JBCurrencyAmount.sol";
-import {JBFundAccessLimitGroup} from "../../../../src/structs/JBFundAccessLimitGroup.sol";
-import {JBFundAccessSetup} from "./JBFundAccessSetup.sol";
-
-contract TestSetFundAccessLimitsFor_Local is JBFundAccessSetup {
-    uint256 _projectId = 1;
-    uint256 _ruleset = block.timestamp;
-    uint32 _validCurrency = uint32(uint160(JBConstants.NATIVE_TOKEN));
-    address _terminal = address(1);
-    address _terminal2 = address(2);
-    address _someToken = makeAddr("sometoken");
-    uint224 _validLimit = 1e18;
-
-    function setUp() public {
-        super.fundAccessSetup();
-    }
-
-    function test_WhenCallerIsNotController() external {
-        // it will revert
-
-        bytes memory _controllerCall = abi.encodeCall(IJBDirectory.controllerOf, (1));
-        bytes memory _return = abi.encode(address(makeAddr("notThisContract")));
-
-        mockExpect(address(directory), _controllerCall, _return);
-
-        // Fund Access config
-        JBFundAccessLimitGroup[] memory _fundAccessLimitGroup = new JBFundAccessLimitGroup[](2);
-
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JBControlled.JBControlled_ControllerUnauthorized.selector, address(makeAddr("notThisContract"))
-            )
-        );
-        _fundAccess.setFundAccessLimitsFor(_projectId, _ruleset, _fundAccessLimitGroup);
-    }
-
-    modifier whenCallerIsControllerOfProject() {
-        bytes memory _controllerCall = abi.encodeCall(IJBDirectory.controllerOf, (1));
-        bytes memory _return = abi.encode(address(this));
-
-        mockExpect(address(directory), _controllerCall, _return);
-        _;
-    }
-
-    function test_GivenPayoutLimitCurrencyIsNotGivenInAscendingOrder() external whenCallerIsControllerOfProject {
-        // it will revert INVALID_PAYOUT_LIMIT_CURRENCY_ORDERING
-
-        // Fund Access config
-        JBFundAccessLimitGroup[] memory _fundAccessLimitGroup = new JBFundAccessLimitGroup[](2);
-        {
-            // Specify a payout limit.
-            JBCurrencyAmount[] memory _payoutLimits = new JBCurrencyAmount[](2);
-            _payoutLimits[0] = JBCurrencyAmount({amount: _validLimit, currency: type(uint32).max});
-
-            // Specify a second payout limit.
-            _payoutLimits[1] =
-                JBCurrencyAmount({amount: _validLimit, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))});
-
-            // Specify a surplus allowance.
-            JBCurrencyAmount[] memory _surplusAllowances = new JBCurrencyAmount[](0);
-
-            _fundAccessLimitGroup[0] = JBFundAccessLimitGroup({
-                terminal: address(_terminal),
-                token: JBConstants.NATIVE_TOKEN,
-                payoutLimits: _payoutLimits,
-                surplusAllowances: _surplusAllowances
-            });
-        }
-
-        vm.expectRevert(JBFundAccessLimits.JBFundAccessLimits_InvalidPayoutLimitCurrencyOrdering.selector);
-        _fundAccess.setFundAccessLimitsFor(_projectId, _ruleset, _fundAccessLimitGroup);
-    }
-
-    function test_GivenSurplusAllowanceCurrenciesAreNotAscendingOrder() external whenCallerIsControllerOfProject {
-        // it will revert INVALID_SURPLUS_ALLOWANCE_CURRENCY_ORDERING
-
-        // Fund Access config
-        JBFundAccessLimitGroup[] memory _fundAccessLimitGroup = new JBFundAccessLimitGroup[](2);
-        {
-            // Specify a payout limit.
-            JBCurrencyAmount[] memory _payoutLimits = new JBCurrencyAmount[](1);
-            _payoutLimits[0] = JBCurrencyAmount({amount: _validLimit, currency: _validCurrency});
-
-            // Specify a surplus allowance.
-            JBCurrencyAmount[] memory _surplusAllowances = new JBCurrencyAmount[](2);
-            _surplusAllowances[0] = JBCurrencyAmount({amount: _validLimit, currency: type(uint32).max});
-
-            _surplusAllowances[1] = JBCurrencyAmount({amount: _validLimit, currency: _validCurrency});
-
-            _fundAccessLimitGroup[0] = JBFundAccessLimitGroup({
-                terminal: address(_terminal),
-                token: JBConstants.NATIVE_TOKEN,
-                payoutLimits: _payoutLimits,
-                surplusAllowances: _surplusAllowances
-            });
-        }
-
-        vm.expectRevert(JBFundAccessLimits.JBFundAccessLimits_InvalidSurplusAllowanceCurrencyOrdering.selector);
-        _fundAccess.setFundAccessLimitsFor(_projectId, _ruleset, _fundAccessLimitGroup);
-    }
-
-    function test_GivenValidConfig() external whenCallerIsControllerOfProject {
-        // it will set packed properties and emit SetFundAccessLimits
-
-        // Fund Access config
-        JBFundAccessLimitGroup[] memory _fundAccessLimitGroup = new JBFundAccessLimitGroup[](2);
-        {
-            // Specify a payout limit.
-            JBCurrencyAmount[] memory _payoutLimits = new JBCurrencyAmount[](2);
-            _payoutLimits[0] =
-                JBCurrencyAmount({amount: _validLimit, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))});
-
-            // Specify a second payout limit.
-            // forge-lint: disable-next-line(unsafe-typecast)
-            _payoutLimits[1] = JBCurrencyAmount({amount: _validLimit, currency: uint32(uint160(_someToken))});
-
-            // Specify a surplus allowance.
-            JBCurrencyAmount[] memory _surplusAllowances = new JBCurrencyAmount[](0);
-
-            _fundAccessLimitGroup[0] = JBFundAccessLimitGroup({
-                terminal: address(_terminal),
-                token: JBConstants.NATIVE_TOKEN,
-                payoutLimits: _payoutLimits,
-                surplusAllowances: _surplusAllowances
-            });
-
-            _fundAccessLimitGroup[1] = JBFundAccessLimitGroup({
-                terminal: address(_terminal2),
-                token: JBConstants.NATIVE_TOKEN,
-                payoutLimits: _payoutLimits,
-                surplusAllowances: _surplusAllowances
-            });
-        }
-
-        vm.expectEmit();
-        emit IJBFundAccessLimits.SetFundAccessLimits(_ruleset, _projectId, _fundAccessLimitGroup[0], address(this));
-
-        vm.expectEmit();
-        emit IJBFundAccessLimits.SetFundAccessLimits(_ruleset, _projectId, _fundAccessLimitGroup[1], address(this));
-
-        _fundAccess.setFundAccessLimitsFor(_projectId, _ruleset, _fundAccessLimitGroup);
-    }
-
-    function test_GivenValidConfigWithLimitsZero() external whenCallerIsControllerOfProject {
-        // it will set packed properties and emit SetFundAccessLimits
-
-        // Fund Access config
-        JBFundAccessLimitGroup[] memory _fundAccessLimitGroup = new JBFundAccessLimitGroup[](2);
-        {
-            // Specify a payout limit.
-            JBCurrencyAmount[] memory _payoutLimits = new JBCurrencyAmount[](1);
-            _payoutLimits[0] = JBCurrencyAmount({amount: 0, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))});
-
-            // Specify a surplus allowance.
-            JBCurrencyAmount[] memory _surplusAllowances = new JBCurrencyAmount[](1);
-            _surplusAllowances[0] = JBCurrencyAmount({amount: 0, currency: type(uint32).max});
-
-            _fundAccessLimitGroup[0] = JBFundAccessLimitGroup({
-                terminal: address(_terminal),
-                token: JBConstants.NATIVE_TOKEN,
-                payoutLimits: _payoutLimits,
-                surplusAllowances: _surplusAllowances
-            });
-
-            _fundAccessLimitGroup[1] = JBFundAccessLimitGroup({
-                terminal: address(_terminal2),
-                token: JBConstants.NATIVE_TOKEN,
-                payoutLimits: _payoutLimits,
-                surplusAllowances: _surplusAllowances
-            });
-        }
-
-        vm.expectEmit();
-        emit IJBFundAccessLimits.SetFundAccessLimits(_ruleset, _projectId, _fundAccessLimitGroup[0], address(this));
-
-        vm.expectEmit();
-        emit IJBFundAccessLimits.SetFundAccessLimits(_ruleset, _projectId, _fundAccessLimitGroup[1], address(this));
-
-        _fundAccess.setFundAccessLimitsFor(_projectId, _ruleset, _fundAccessLimitGroup);
-    }
-}

package/test/units/static/JBFundAccessLimits/TestSurplusAllowanceOf.sol

@@ -1,64 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
-import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
-import {JBCurrencyAmount} from "../../../../src/structs/JBCurrencyAmount.sol";
-import {JBFundAccessLimitGroup} from "../../../../src/structs/JBFundAccessLimitGroup.sol";
-import {JBFundAccessSetup} from "./JBFundAccessSetup.sol";
-
-contract TestSurplusAllowanceOf_Local is JBFundAccessSetup {
-    uint256 _projectId = 1;
-    address _terminal = address(1);
-
-    function setUp() public {
-        super.fundAccessSetup();
-    }
-
-    modifier whenCallerIsControllerOfProject() {
-        bytes memory _controllerCall = abi.encodeCall(IJBDirectory.controllerOf, (1));
-        bytes memory _return = abi.encode(address(this));
-
-        mockExpect(address(directory), _controllerCall, _return);
-        _;
-    }
-
-    function test_WhenAProjectHasTheSpecificSurplusConfigured() external whenCallerIsControllerOfProject {
-        // it will return uint256 surplusAllowance
-
-        // Fund Access config
-        JBFundAccessLimitGroup[] memory _fundAccessLimitGroup = new JBFundAccessLimitGroup[](2);
-        {
-            // Specify a payout limit.
-            JBCurrencyAmount[] memory _payoutLimits = new JBCurrencyAmount[](0);
-
-            // Specify a surplus allowance.
-            JBCurrencyAmount[] memory _surplusAllowances = new JBCurrencyAmount[](1);
-            _surplusAllowances[0] =
-                JBCurrencyAmount({amount: 1e18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))});
-
-            _fundAccessLimitGroup[0] = JBFundAccessLimitGroup({
-                terminal: _terminal,
-                token: JBConstants.NATIVE_TOKEN,
-                payoutLimits: _payoutLimits,
-                surplusAllowances: _surplusAllowances
-            });
-        }
-
-        _fundAccess.setFundAccessLimitsFor(_projectId, block.timestamp, _fundAccessLimitGroup);
-
-        uint256 _returned = _fundAccess.surplusAllowanceOf(
-            _projectId, block.timestamp, _terminal, JBConstants.NATIVE_TOKEN, uint32(uint160(JBConstants.NATIVE_TOKEN))
-        );
-        assertEq(_returned, 1e18);
-    }
-
-    function test_WhenItDoesntHaveTheSpecificSurplusConfigured() external view {
-        // it will return 0
-
-        uint256 _returned = _fundAccess.surplusAllowanceOf(
-            _projectId, block.timestamp, _terminal, JBConstants.NATIVE_TOKEN, uint32(uint160(JBConstants.NATIVE_TOKEN))
-        );
-        assertEq(_returned, 0);
-    }
-}