Merge pull request #148 from huff-language/fix/forge-test-failing

Fix `forge test` failing

Author: MathisGD

src/math/SafeMath.huff

@@ -4,8 +4,6 @@
 /// @notice Math module over Solidity's arithmetic operations with safety checks
 /// @notice Adapted from OpenZeppelin (https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/math/SafeMath.sol)
 
-#include "../utils/Errors.huff"
-
 // Interface
 #define function safeAdd(uint256,uint256) pure returns (uint256)
 #define function safeSub(uint256,uint256) pure returns (uint256)

src/proxies/Clones.huff

@@ -12,7 +12,6 @@
 /// @notice Adapted from OpenZeppelin (https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/proxy/Clones.sol)
 
 #include "./ERC1967Upgrade.huff"
-#include "../utils/CommonErrors.huff"
 
 // BEFORE ADDRESS
 //--------------------------------------------------------------------------------//

src/proxies/ERC1967Upgrade.huff

@@ -5,6 +5,7 @@
 /// @dev This abstract contract provides getters and event emitting update functions for https://eips.ethereum.org/EIPS/eip-1967[EIP1967] slots.
 /// @notice Adapted from OpenZeppelin (https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/proxy/ERC1967/ERC1967Upgrade.sol)
 
+#include "../utils/Errors.huff"
 #include "../utils/CommonErrors.huff"
 
 // Function Definitions

src/tokens/ERC20.huff

@@ -6,7 +6,6 @@
 /// @notice Adapted from Solmate (https://github.com/transmissions11/solmate/blob/main/src/tokens/ERC20.sol)
 
 // Imports
-#include "../utils/Errors.huff"
 #include "../auth/NonPayable.huff"
 #include "../data-structures/Hashmap.huff"
 
@@ -70,7 +69,7 @@
     [INITIAL_DOMAIN_SEPARATOR] sstore       // []
 
     // Copy the runtime bytecode with constructor argument concatenated.
-    0x67                                    // [offset] - constructor code size
+    __codesize(CONSTRUCTOR)                 // [offset] - constructor code size
     dup1                                    // [offset, offset]
     codesize                                // [total_size, offset, offset]
     sub                                     // [runtime_size, offset]
@@ -243,24 +242,6 @@
     [BALANCE_SLOT] STORE_ELEMENT_FROM_KEYS(0x00)        // [value, from, to]
 }
 
-/// @notice Approve
-/// @notice Approves an address to spend an amount of tokens on the caller's behalf
-#define macro APPROVE() = takes (0) returns (0) {
-    0x24 calldataload                           // [value]
-    dup1 0x00 mstore                            // [value]
-    0x04 calldataload                           // [to, value]
-    caller                                      // [from, to, value]
-
-    // Emit the approval event.
-    dup2 dup2                                   // [from, to, from, to, value]
-    __EVENT_HASH(APPROVAL_EVENT_SIGNATURE)      // [sig, from, to, from, to, value]
-    0x20 0x00                                   // [0, 32, sig, from, to, from, to, value]
-    log3                                        // [from, to, value]
-
-    // Store the value at slot = keccak256(from . to)
-    STORE_ELEMENT_FROM_KEYS(0x00)
-}
-
 /// @notice Domain Separator
 /// @notice Returns the EIP-712 domain separator
 #define macro DOMAIN_SEPARATOR() = takes (0) returns (0) {

src/utils/Bytecode.huff

@@ -4,6 +4,7 @@
 /// @notice Low-level bytecode utilities
 /// @notice Adapted from 0xsequence/sstore2 (https://github.com/0xsequence/sstore2/blob/master/contracts/utils/Bytecode.sol)
 
+#include "./Errors.huff"
 #include "./CommonErrors.huff"
 
 /// @notice Generate a creation code that results on a contract with `_code` as bytecode

src/utils/CREATE3.huff

@@ -5,6 +5,7 @@
 /// @notice Deploy to deterministic addresses without an initcode factor
 /// @notice Adapted from Solmate (https://github.com/transmissions11/solmate/blob/main/src/utils/CREATE3.sol)
 
+#include "./Errors.huff"
 #include "./CommonErrors.huff"
 
 

src/utils/CommonErrors.huff

@@ -3,7 +3,6 @@
 /// @author asnared <https://github.com/abigger87>
 /// @notice Wrappers for reverting with common error messages
 
-#include "./Errors.huff"
 
 // Error Constants
 #define constant NOT_AUTHORIZED_ERROR = 0x4e4f545f415554484f52495a4544000000000000000000000000000000000000

src/utils/MerkleDistributor.huff

@@ -7,6 +7,7 @@
 
 
 // Imports
+#include "./Errors.huff"
 #include "./CommonErrors.huff"
 #include "./MerkleProofLib.huff"
 #include "./Address.huff"

src/utils/ReentrancyGuard.huff

@@ -4,6 +4,7 @@
 /// @notice Gas optimized reentrancy guard for smart contracts.
 /// @notice Adapted from Solmate (https://github.com/transmissions11/solmate/blob/main/src/utils/ReentrancyGuard.sol)
 
+#include "./Errors.huff"
 #include "./CommonErrors.huff"
 
 // Interface

src/utils/Refunded.huff

@@ -4,7 +4,6 @@
 /// @notice Efficient gas refunds distributed through a modifier
 /// @notice Adapted from Zolidity (https://github.com/z0r0z/zolidity/blob/main/src/utils/Refunded.sol)
 
-#include "./Errors.huff"
 #include "./ReentrancyGuard.huff"
 
 /// @notice The base cost of refunding