final cleanup (minimize changes)

OpenZeppelin · Jan 24, 2024 · 2c85474 · 2c85474
1 parent 12e2952
commit 2c85474
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/contracts/mocks/token/ERC1363ReceiverMock.sol b/contracts/mocks/token/ERC1363ReceiverMock.sol
@@ -24,9 +24,9 @@ contract ERC1363ReceiverMock is IERC1363Receiver {
         _error = RevertType.None;
     }
 
-    function setUp(bytes4 retval, RevertType err) public {
+    function setUp(bytes4 retval, RevertType error) public {
         _retval = retval;
-        _error = err;
+        _error = error;
     }
 
     function onTransferReceived(

diff --git a/contracts/token/ERC20/extensions/ERC1363.sol b/contracts/token/ERC20/extensions/ERC1363.sol
@@ -59,7 +59,7 @@ abstract contract ERC1363 is ERC20, ERC165, IERC1363 {
      * - The target has code (i.e. is a contract).
      * - The target `to` must implement the {IERC1363Receiver} interface.
      * - The target should return the {IERC1363Receiver} interface id.
-     * - The internal {transfer} must have succeeded (returned `true`).
+     * - The internal {transfer} must succeed (returned `true`).
      */
     function transferAndCall(address to, uint256 value) public returns (bool) {
         return transferAndCall(to, value, "");
@@ -86,7 +86,7 @@ abstract contract ERC1363 is ERC20, ERC165, IERC1363 {
      * - The target has code (i.e. is a contract).
      * - The target `to` must implement the {IERC1363Receiver} interface.
      * - The target should return the {IERC1363Receiver} interface id.
-     * - The internal {transferFrom} must have succeeded (returned `true`).
+     * - The internal {transferFrom} must succeed (returned `true`).
      */
     function transferFromAndCall(address from, address to, uint256 value) public returns (bool) {
         return transferFromAndCall(from, to, value, "");
@@ -118,7 +118,7 @@ abstract contract ERC1363 is ERC20, ERC165, IERC1363 {
      * - The target has code (i.e. is a contract).
      * - The target `to` must implement the {IERC1363Spender} interface.
      * - The target should return the {IERC1363Spender} interface id.
-     * - The internal {approve} must have succeeded (returned `true`).
+     * - The internal {approve} must succeed (returned `true`).
      */
     function approveAndCall(address spender, uint256 value) public returns (bool) {
         return approveAndCall(spender, value, "");

diff --git a/lib/forge-std b/lib/forge-std
+0 −1		.gitattributes
+6 −48		.github/workflows/ci.yml
+0 −29		.github/workflows/sync.yml
+1 −1		foundry.toml
+1 −1		lib/ds-test
+2 −2		package.json
+0 −635		scripts/vm.py
+3 −5		src/Base.sol
+3 −4		src/Script.sol
+8 −8		src/StdAssertions.sol
+25 −40		src/StdChains.sol
+17 −210		src/StdCheats.sol
+1 −16		src/StdInvariant.sol
+14 −18		src/StdJson.sol
+3 −54		src/StdStorage.sol
+2 −2		src/StdStyle.sol
+35 −72		src/StdUtils.sol
+3 −4		src/Test.sol
+299 −1,004		src/Vm.sol
+382 −394		src/console2.sol
+0 −216		src/mocks/MockERC20.sol
+0 −221		src/mocks/MockERC721.sol
+0 −13,248		src/safeconsole.sol
+84 −145		test/StdAssertions.t.sol
+58 −114		test/StdChains.t.sol
+43 −252		test/StdCheats.t.sol
+11 −13		test/StdError.t.sol
+12 −27		test/StdMath.t.sol
+34 −66		test/StdStorage.t.sol
+4 −4		test/StdStyle.t.sol
+35 −80		test/StdUtils.t.sol
+0 −15		test/Vm.t.sol
+0 −441		test/mocks/MockERC20.t.sol
+0 −721		test/mocks/MockERC721.t.sol