@bananapus/core-v6 0.0.33 → 0.0.35

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

@@ -4,7 +4,6 @@ pragma solidity 0.8.28;
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {JBERC20} from "../../../../src/JBERC20.sol";
 import {JBERC20Setup} from "./JBERC20Setup.sol";
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
 contract TestInitialize_Local is JBERC20Setup {
     string _name = "Nana";
@@ -17,21 +16,21 @@ contract TestInitialize_Local is JBERC20Setup {
     function test_ImplementationCannotBeInitialized() external {
         // The implementation has _name = "invalid" set in constructor, so initialize() must revert.
         vm.expectRevert(JBERC20.JBERC20_AlreadyInitialized.selector);
-        _implementation.initialize(_name, _symbol, _owner);
+        _implementation.initialize(_name, _symbol, _tokens);
     }
 
     function test_WhenANameIsAlreadySet() external {
         // it will revert
 
-        _erc20.initialize(_name, _symbol, _owner);
+        _erc20.initialize(_name, _symbol, _tokens);
 
-        // ensure ownership transferred
-        address newOwner = Ownable(address(_erc20)).owner();
-        assertEq(newOwner, _owner);
+        // ensure TOKENS is set
+        address setTokens = address(JBERC20(address(_erc20)).TOKENS());
+        assertEq(setTokens, _tokens);
 
         // will fail as internal name is no longer zero length
         vm.expectRevert();
-        _erc20.initialize(_name, _symbol, _owner);
+        _erc20.initialize(_name, _symbol, _tokens);
     }
 
     function test_WhenName_EQNothing() external {
@@ -39,17 +38,17 @@ contract TestInitialize_Local is JBERC20Setup {
 
         // will fail as internal name is no longer than zero length
         vm.expectRevert();
-        _erc20.initialize("", _symbol, _owner);
+        _erc20.initialize("", _symbol, _tokens);
     }
 
     function test_WhenNameIsValidAndNotAlreadySet() external {
-        // it will set the name and symbol and transfer ownership
+        // it will set the name, symbol, and store references
 
-        _erc20.initialize(_name, _symbol, _owner);
+        _erc20.initialize(_name, _symbol, _tokens);
 
-        // ensure ownership transferred
-        address newOwner = Ownable(address(_erc20)).owner();
-        assertEq(newOwner, _owner);
+        // ensure TOKENS is set
+        address setTokens = address(JBERC20(address(_erc20)).TOKENS());
+        assertEq(setTokens, _tokens);
 
         // name is set
         string memory _setName = IERC20Metadata(address(_erc20)).name();

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

@@ -15,7 +15,7 @@ contract TestName_Local is JBERC20Setup {
 
     function test_WhenANameIsSet() external {
         // it will return the name
-        _erc20.initialize("NANAPUS", "NANA", _owner);
+        _erc20.initialize("NANAPUS", "NANA", _tokens);
 
         string memory _setName = _token.name();
         assertEq(_setName, "NANAPUS");

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

@@ -6,6 +6,7 @@ import {JBERC20Setup} from "./JBERC20Setup.sol";
 import {SigUtils} from "./SigUtils.sol";
 
 contract TestNonces_Local is JBERC20Setup {
+    address _user = makeAddr("user");
     IERC20Permit _token;
     SigUtils sigUtils;
 
@@ -30,7 +31,7 @@ contract TestNonces_Local is JBERC20Setup {
     function test_WhenAUserHasNotCalledPermit() external view {
         // it will return zero
 
-        uint256 _nonce = _token.nonces(_owner);
+        uint256 _nonce = _token.nonces(_user);
 
         assertEq(_nonce, 0);
     }

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

@@ -16,7 +16,7 @@ contract TestSymbol_Local is JBERC20Setup {
     function test_WhenASymbolIsSet() external {
         // it will return a non-empty string
 
-        _erc20.initialize("NANAPUS", "NANA", _owner);
+        _erc20.initialize("NANAPUS", "NANA", _tokens);
 
         string memory _setSymbol = _token.symbol();
         assertEq(_setSymbol, "NANA");

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

@@ -453,7 +453,7 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
         mockExpect(
             address(_dataHook),
             abi.encodeCall(IJBRulesetDataHook.beforeCashOutRecordedWith, (_context)),
-            abi.encode(0, 10e18, _totalSupply, _spec)
+            abi.encode(0, 10e18, _totalSupply, 3e18, _spec)
         );
 
         (, uint256 reclaimAmount, uint256 cashOutTaxRate, JBCashOutHookSpecification[] memory hookSpecifications) = _store.previewCashOutFrom({

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

@@ -417,7 +417,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
         mockExpect(
             address(_dataHook),
             abi.encodeCall(IJBRulesetDataHook.beforeCashOutRecordedWith, (_context)),
-            abi.encode(0, 1e18, _totalSupply, _spec)
+            abi.encode(0, 1e18, _totalSupply, 3e18, _spec)
         );
 
         uint256 balanceBefore = _store.balanceOf(address(this), _projectId, _accountingContexts.token);
@@ -521,7 +521,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
         mockExpect(
             address(_dataHook),
             abi.encodeCall(IJBRulesetDataHook.beforeCashOutRecordedWith, (_context)),
-            abi.encode(0, 1e18, _totalSupply, _spec)
+            abi.encode(0, 1e18, _totalSupply, 3e18, _spec)
         );
 
         (, uint256 reclaimed,,) = _store.recordCashOutFor({
@@ -576,7 +576,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
         mockExpect(
             address(_dataHook),
             abi.encodeCall(IJBRulesetDataHook.beforeCashOutRecordedWith, (_context)),
-            abi.encode(0, 1e18, _totalSupply, _spec)
+            abi.encode(0, 1e18, _totalSupply, 3e18, _spec)
         );
 
         vm.expectRevert(abi.encodeWithSelector(JBTerminalStore.JBTerminalStore_NoopHookSpecHasAmount.selector, 1));
@@ -631,7 +631,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
         mockExpect(
             address(_dataHook),
             abi.encodeCall(IJBRulesetDataHook.beforeCashOutRecordedWith, (_context)),
-            abi.encode(0, 1e18, _totalSupply, _spec)
+            abi.encode(0, 1e18, _totalSupply, 3e18, _spec)
         );
 
         vm.expectRevert(abi.encodeWithSelector(JBTerminalStore.JBTerminalStore_NoopHookSpecHasAmount.selector, 1));

package/test/units/static/JBTokens/JBTokensSetup.sol

@@ -4,6 +4,8 @@ pragma solidity 0.8.28;
 import {JBERC20} from "../../../../src/JBERC20.sol";
 import {JBTokens} from "../../../../src/JBTokens.sol";
 import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
 import {IJBToken} from "../../../../src/interfaces/IJBToken.sol";
 import {IJBTokens} from "../../../../src/interfaces/IJBTokens.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
@@ -15,6 +17,8 @@ Tests relative to this contract will be dependent on mock calls/emits and stdSto
 contract JBTokensSetup is JBTest {
     // Mocks
     IJBDirectory public directory = IJBDirectory(makeAddr("directory"));
+    IJBPermissions public permissions = IJBPermissions(makeAddr("permissions"));
+    IJBProjects public projects = IJBProjects(makeAddr("projects"));
     IJBToken public jbToken;
 
     // Target Contract
@@ -22,7 +26,7 @@ contract JBTokensSetup is JBTest {
 
     function tokensSetup() public virtual {
         // Instantiate the contract being tested
-        jbToken = new JBERC20();
+        jbToken = new JBERC20(permissions, projects);
         _tokens = new JBTokens(directory, jbToken);
     }
 }