Bump OZ to v4.9.6 (#68)

* Bump OZ to v4.9.6 https://github.com/OpenZeppelin/openzeppelin-contracts/releases/tag/v4.9.6 * Bump forge-std * Bump solmate * Fix forge test cheat function name * Resolve compiler warnings about tests * forge fmt
ScopeLift · Nov 6, 2024 · d81f597 · d81f597
1 parent d71c4e0
commit d81f597
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/solmate b/lib/solmate
diff --git a/test/FractionalPool.t.sol b/test/FractionalPool.t.sol
@@ -101,7 +101,7 @@ contract FractionalPoolTest is Test {
 }
 
 contract Deployment is FractionalPoolTest {
-  function test_FractionalPoolDeployment() public {
+  function test_FractionalPoolDeployment() public view {
     assertEq(token.name(), "Governance Token");
     assertEq(token.symbol(), "GOV");
 

diff --git a/test/GovernorCountingFractional.t.sol b/test/GovernorCountingFractional.t.sol
@@ -185,7 +185,7 @@ contract GovernorCountingFractionalTest is Test {
     returns (address)
   {
     vm.assume(_addr > address(0));
-    assumeNoPrecompiles(_addr);
+    assumeNotPrecompile(_addr);
     vm.label(_addr, _name);
     return _addr;
   }
@@ -195,13 +195,13 @@ contract GovernorCountingFractionalTest is Test {
     nextUser = keccak256(abi.encodePacked(_addr));
   }
 
-  function _randomSupportType(uint256 salt) public view returns (uint8) {
+  function _randomSupportType(uint256 salt) public pure returns (uint8) {
     return uint8(bound(salt, 0, uint8(GovernorCompatibilityBravo.VoteType.Abstain)));
   }
 
   function _randomVoteSplit(FractionalVoteSplit memory _voteSplit)
     public
-    view
+    pure
     returns (FractionalVoteSplit memory)
   {
     _voteSplit.percentFor = bound(_voteSplit.percentFor, 0, 1e18);
@@ -350,7 +350,7 @@ contract GovernorCountingFractionalTest is Test {
   /// END HELPER FUNCTIONS
   /// --------------------
 
-  function testFuzz_Deployment(uint256 _blockNumber) public {
+  function testFuzz_Deployment(uint256 _blockNumber) public view {
     assertEq(governor.name(), "Governor");
     assertEq(address(governor.token()), address(token));
     assertEq(governor.votingDelay(), 4);
+1 −0		.gitattributes
+85 −15		.github/workflows/ci.yml
+31 −0		.github/workflows/sync.yml
+0 −3		.gitmodules
+193 −0		CONTRIBUTING.md
+18 −2		README.md
+5 −5		foundry.toml
+0 −1		lib/ds-test
+2 −2		package.json
+646 −0		scripts/vm.py
+35 −0		src/Base.sol
+0 −13		src/Common.sol
+0 −13		src/Components.sol
+20 −7		src/Script.sol
+595 −135		src/StdAssertions.sol
+263 −0		src/StdChains.sol
+354 −156		src/StdCheats.sol
+122 −0		src/StdInvariant.sol
+229 −17		src/StdJson.sol
+246 −100		src/StdStorage.sol
+333 −0		src/StdStyle.sol
+283 −0		src/StdToml.sol
+174 −28		src/StdUtils.sol
+28 −6		src/Test.sol
+2,128 −243		src/Vm.sol
+635 −608		src/console.sol
+1 −1,535		src/console2.sol
+2 −1		src/interfaces/IERC1155.sol
+1 −0		src/interfaces/IERC165.sol
+1 −0		src/interfaces/IERC20.sol
+3 −2		src/interfaces/IERC4626.sol
+1 −0		src/interfaces/IERC721.sol
+73 −0		src/interfaces/IMulticall3.sol
+234 −0		src/mocks/MockERC20.sol
+231 −0		src/mocks/MockERC721.sol
+13,937 −0		src/safeconsole.sol
+130 −572		test/StdAssertions.t.sol
+228 −0		test/StdChains.t.sol
+380 −45		test/StdCheats.t.sol
+15 −13		test/StdError.t.sol
+49 −0		test/StdJson.t.sol
+31 −26		test/StdMath.t.sol
+232 −44		test/StdStorage.t.sol
+110 −0		test/StdStyle.t.sol
+49 −0		test/StdToml.t.sol
+280 −34		test/StdUtils.t.sol
+18 −0		test/Vm.t.sol
+10 −0		test/compilation/CompilationScript.sol
+10 −0		test/compilation/CompilationScriptBase.sol
+10 −0		test/compilation/CompilationTest.sol
+10 −0		test/compilation/CompilationTestBase.sol
+8 −0		test/fixtures/test.json
+6 −0		test/fixtures/test.toml
+441 −0		test/mocks/MockERC20.t.sol
+721 −0		test/mocks/MockERC721.t.sol
+1 −1		.github/actions/setup/action.yml
+13 −0		CHANGELOG.md
+21 −10		contracts/metatx/ERC2771Context.sol
+19 −0		contracts/mocks/Base64Dirty.sol
+6 −1		contracts/mocks/ERC2771ContextMock.sol
+36 −23		contracts/mocks/docs/ERC4626Fees.sol
+10 −10		contracts/mocks/token/ERC4646FeesMock.sol
+1 −1		contracts/package.json
+5 −3		contracts/token/ERC20/README.adoc
+4 −4		contracts/token/ERC20/extensions/ERC20Permit.sol
+31 −1		contracts/token/ERC20/extensions/IERC20Permit.sol
+19 −10		contracts/utils/Base64.sol
+5 −1		contracts/utils/Context.sol
+17 −3		contracts/utils/Multicall.sol
+0 −1		docs/modules/ROOT/nav.adoc
+0 −15		docs/modules/ROOT/pages/wizard.adoc
+2 −2		package-lock.json
+1 −1		package.json
+8 −2		scripts/release/workflow/publish.sh
+54 −1		test/metatx/ERC2771Context.test.js
+3 −3		test/token/ERC20/extensions/ERC4626.test.js
+11 −1		test/utils/Base64.test.js