fix(test): extract helper contracts to separate files

The invariant-tests workflow injects wrapper functions before every
'^}$' line in the test file. With helpers inline, the wrappers got
injected into helper contracts too. Moved GasTestStorage, TIP1016Storage,
and GasLeftChecker to test/helpers/.

Co-Authored-By: Federico Gimenez <70376+fgimenez@users.noreply.github.com>

Author: decofe

tips/ref-impls/test/helpers/GasTestStorage.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+pragma solidity >=0.8.13 <0.9.0;
+
+/// @title GasTestStorage - Contract for testing SSTORE gas costs
+contract GasTestStorage {
+
+    mapping(bytes32 => uint256) private _storage;
+
+    function storeValue(bytes32 slot, uint256 value) external {
+        _storage[slot] = value;
+    }
+
+    function storeMultiple(bytes32[] calldata slots) external {
+        for (uint256 i = 0; i < slots.length; i++) {
+            _storage[slots[i]] = 1;
+        }
+    }
+
+    function getValue(bytes32 slot) external view returns (uint256) {
+        return _storage[slot];
+    }
+
+}

tips/ref-impls/test/helpers/TIP1016Helpers.sol

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+pragma solidity >=0.8.13 <0.9.0;
+
+/// @title TIP1016Storage - Contract for testing TIP-1016 gas semantics
+contract TIP1016Storage {
+
+    mapping(bytes32 => uint256) private _storage;
+
+    function storeValue(bytes32 slot, uint256 value) external {
+        _storage[slot] = value;
+    }
+
+    function storeMultiple(bytes32[] calldata slots) external {
+        for (uint256 i = 0; i < slots.length; i++) {
+            _storage[slots[i]] = 1;
+        }
+    }
+
+    function storeAndClear(bytes32 slot, uint256 value) external {
+        _storage[slot] = value;
+        _storage[slot] = 0;
+    }
+
+    function getValue(bytes32 slot) external view returns (uint256) {
+        return _storage[slot];
+    }
+
+}
+
+/// @title GasLeftChecker - Contract that records gasleft() for RES1 testing
+contract GasLeftChecker {
+
+    uint256 public lastGasLeft;
+
+    function checkGasLeft() external {
+        lastGasLeft = gasleft();
+    }
+
+}

tips/ref-impls/test/invariants/GasPricing.t.sol

@@ -6,36 +6,12 @@ import { Test } from "forge-std/Test.sol";
 import { ITIP20 } from "../../src/interfaces/ITIP20.sol";
 import { InvariantBase } from "../helpers/InvariantBase.sol";
 import { Counter, InitcodeHelper, SimpleStorage } from "../helpers/TestContracts.sol";
+import { GasTestStorage } from "../helpers/GasTestStorage.sol";
 import { TxBuilder } from "../helpers/TxBuilder.sol";
 
 import { VmExecuteTransaction, VmRlp } from "tempo-std/StdVm.sol";
 import { LegacyTransaction, LegacyTransactionLib } from "tempo-std/tx/LegacyTransactionLib.sol";
 
-/*//////////////////////////////////////////////////////////////
-                        HELPER CONTRACTS
-//////////////////////////////////////////////////////////////*/
-
-/// @title GasTestStorage - Contract for testing SSTORE gas costs
-contract GasTestStorage {
-
-    mapping(bytes32 => uint256) private _storage;
-
-    function storeValue(bytes32 slot, uint256 value) external {
-        _storage[slot] = value;
-    }
-
-    function storeMultiple(bytes32[] calldata slots) external {
-        for (uint256 i = 0; i < slots.length; i++) {
-            _storage[slots[i]] = 1;
-        }
-    }
-
-    function getValue(bytes32 slot) external view returns (uint256) {
-        return _storage[slot];
-    }
-
-}
-
 /// @title TIP-1000 / TIP-1016 Gas Pricing Invariant Tests
 /// @notice Fuzz-based invariant tests for Tempo's state creation gas costs
 /// @dev Tests gas pricing invariants at the EVM opcode level using vmExec.executeTransaction()

tips/ref-impls/test/invariants/TIP1016.t.sol

@@ -6,52 +6,12 @@ import { Test } from "forge-std/Test.sol";
 import { ITIP20 } from "../../src/interfaces/ITIP20.sol";
 import { InvariantBase } from "../helpers/InvariantBase.sol";
 import { Counter, InitcodeHelper, SimpleStorage } from "../helpers/TestContracts.sol";
+import { TIP1016Storage, GasLeftChecker } from "../helpers/TIP1016Helpers.sol";
 import { TxBuilder } from "../helpers/TxBuilder.sol";
 
 import { VmExecuteTransaction, VmRlp } from "tempo-std/StdVm.sol";
 import { LegacyTransaction, LegacyTransactionLib } from "tempo-std/tx/LegacyTransactionLib.sol";
 
-/*//////////////////////////////////////////////////////////////
-                        HELPER CONTRACTS
-//////////////////////////////////////////////////////////////*/
-
-/// @title TIP1016Storage - Contract for testing TIP-1016 gas semantics
-contract TIP1016Storage {
-
-    mapping(bytes32 => uint256) private _storage;
-
-    function storeValue(bytes32 slot, uint256 value) external {
-        _storage[slot] = value;
-    }
-
-    function storeMultiple(bytes32[] calldata slots) external {
-        for (uint256 i = 0; i < slots.length; i++) {
-            _storage[slots[i]] = 1;
-        }
-    }
-
-    function storeAndClear(bytes32 slot, uint256 value) external {
-        _storage[slot] = value;
-        _storage[slot] = 0;
-    }
-
-    function getValue(bytes32 slot) external view returns (uint256) {
-        return _storage[slot];
-    }
-
-}
-
-/// @title GasLeftChecker - Contract that records gasleft() for RES1 testing
-contract GasLeftChecker {
-
-    uint256 public lastGasLeft;
-
-    function checkGasLeft() external {
-        lastGasLeft = gasleft();
-    }
-
-}
-
 /// @title TIP-1016 State Gas Exemption Invariant Tests
 /// @notice Fuzz-based invariant tests for TIP-1016's gas dimension split, reservoir model,
 ///         block accounting, and refund semantics