@bananapus/core-v6 0.0.21 → 0.0.22

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

@@ -19,17 +19,7 @@ contract MockSurplusTerminal is ERC165, IJBCashOutTerminal {
         surplusAmount = _surplus;
     }
 
-    function currentSurplusOf(
-        uint256,
-        JBAccountingContext[] memory,
-        uint256,
-        uint256
-    )
-        external
-        view
-        override
-        returns (uint256)
-    {
+    function currentSurplusOf(uint256, address[] calldata, uint256, uint256) external view override returns (uint256) {
         return surplusAmount;
     }
 
@@ -131,9 +121,8 @@ contract TestSurplusFuzz_Local is JBTest {
     /// @notice Surplus with no terminals is 0.
     function testFuzz_noTerminals_returnsZero(uint256 projectId) external view {
         IJBTerminal[] memory terminals = new IJBTerminal[](0);
-        JBAccountingContext[] memory contexts = new JBAccountingContext[](0);
 
-        uint256 surplus = JBSurplus.currentSurplusOf(projectId, terminals, contexts, 18, 1);
+        uint256 surplus = JBSurplus.currentSurplusOf(projectId, terminals, new address[](0), 18, 1);
         assertEq(surplus, 0, "surplus with no terminals should be 0");
     }
 
@@ -146,9 +135,7 @@ contract TestSurplusFuzz_Local is JBTest {
         terminals[0] = terminal1;
         terminals[1] = terminal2;
 
-        JBAccountingContext[] memory contexts = new JBAccountingContext[](0);
-
-        uint256 total = JBSurplus.currentSurplusOf(1, terminals, contexts, 18, 1);
+        uint256 total = JBSurplus.currentSurplusOf(1, terminals, new address[](0), 18, 1);
         assertEq(total, uint256(surplus1) + uint256(surplus2), "surplus should be sum of all terminals");
     }
 
@@ -165,10 +152,8 @@ contract TestSurplusFuzz_Local is JBTest {
         IJBTerminal[] memory terminals2 = new IJBTerminal[](1);
         terminals2[0] = terminal2;
 
-        JBAccountingContext[] memory contexts = new JBAccountingContext[](0);
-
-        uint256 total1 = JBSurplus.currentSurplusOf(1, terminals1, contexts, 18, 1);
-        uint256 total2 = JBSurplus.currentSurplusOf(1, terminals2, contexts, 18, 1);
+        uint256 total1 = JBSurplus.currentSurplusOf(1, terminals1, new address[](0), 18, 1);
+        uint256 total2 = JBSurplus.currentSurplusOf(1, terminals2, new address[](0), 18, 1);
 
         assertLe(total1, total2, "surplus should be monotonically increasing");
     }

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

@@ -4,8 +4,10 @@ pragma solidity 0.8.26;
 import {JBTerminalStore} from "../../../../src/JBTerminalStore.sol";
 import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
 import {IJBPrices} from "../../../../src/interfaces/IJBPrices.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
 import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
 import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 /*
@@ -24,5 +26,20 @@ contract JBTerminalStoreSetup is JBTest {
     function terminalStoreSetup() public virtual {
         // Instantiate the contract being tested
         _store = new JBTerminalStore(directory, prices, rulesets);
+
+        // Default mock: allow adding accounting contexts (return zero-id ruleset to bypass the
+        // allowAddAccountingContext check in recordAccountingContextOf).
+        JBRuleset memory _zeroRuleset = JBRuleset({
+            cycleNumber: 0,
+            id: 0,
+            basedOnId: 0,
+            start: 0,
+            duration: 0,
+            weight: 0,
+            weightCutPercent: 0,
+            approvalHook: IJBRulesetApprovalHook(address(0)),
+            metadata: 0
+        });
+        vm.mockCall(address(rulesets), abi.encodeWithSelector(IJBRulesets.currentOf.selector), abi.encode(_zeroRuleset));
     }
 }