@bananapus/router-terminal-v6 0.0.9 → 0.0.10

package/STYLE_GUIDE.md

@@ -2,8 +2,6 @@
 
 How we write Solidity and organize repos across the Juicebox V6 ecosystem. `nana-core-v6` is the gold standard — when in doubt, match what it does.
 
-**This repo's deviations:** `evm_version = 'cancun'`, `via_ir = true` in ci_sizes profile.
-
 ## File Organization
 
 ```
@@ -19,8 +17,6 @@ src/
 
 One contract/interface/struct/enum per file. Name the file after the type it contains.
 
-**Structs, enums, libraries, and interfaces always go in their subdirectories** (`src/structs/`, `src/enums/`, `src/libraries/`, `src/interfaces/`) — never inline in contract files or placed in `src/` root. This keeps type definitions discoverable and import paths consistent across repos.
-
 ## Pragma Versions
 
 ```solidity
@@ -108,14 +104,6 @@ contract JBExample is JBPermissioned, IJBExample {
     // -------------------------- constructor ---------------------------- //
     //*********************************************************************//
 
-    //*********************************************************************//
-    // ---------------------- receive / fallback ------------------------- //
-    //*********************************************************************//
-
-    //*********************************************************************//
-    // --------------------------- modifiers ----------------------------- //
-    //*********************************************************************//
-
     //*********************************************************************//
     // ---------------------- external transactions ---------------------- //
     //*********************************************************************//
@@ -143,28 +131,23 @@ contract JBExample is JBPermissioned, IJBExample {
 ```
 
 **Section order:**
-1. `using` declarations
-2. Custom errors
-3. Public constants
-4. Internal constants
-5. Public immutable stored properties
-6. Internal immutable stored properties
-7. Public stored properties
-8. Internal stored properties
-9. Constructor
-10. `receive` / `fallback`
-11. Modifiers
-12. External transactions
-13. External views
-14. Public transactions
-15. Internal helpers
-16. Internal views
-17. Private helpers
+1. Custom errors
+2. Public constants
+3. Internal constants
+4. Public immutable stored properties
+5. Internal immutable stored properties
+6. Public stored properties
+7. Internal stored properties
+8. Constructor
+9. External transactions
+10. External views
+11. Public transactions
+12. Internal helpers
+13. Internal views
+14. Private helpers
 
 Functions are alphabetized within each section.
 
-**Events:** Events are declared in interfaces only, never in implementation contracts. Implementations inherit events from their interface and emit them unqualified. This keeps the ABI definition in one place and allows tests to use interface-qualified event expectations (e.g., `emit IJBController.LaunchProject(...)`).
-
 ## Interface Structure
 
 ```solidity
@@ -336,10 +319,6 @@ optimizer_runs = 200
 libs = ["node_modules", "lib"]
 fs_permissions = [{ access = "read-write", path = "./"}]
 
-[profile.ci_sizes]
-via_ir = true
-optimizer_runs = 200
-
 [fuzz]
 runs = 4096
 
@@ -354,10 +333,14 @@ multiline_func_header = "all"
 wrap_comments = true
 ```
 
-**Variations:**
-- `evm_version = 'cancun'` for repos using transient storage (buyback-hook, router-terminal, univ4-router)
-- `via_ir = true` for repos hitting stack-too-deep (buyback-hook, banny-retail, univ4-lp-split-hook, deploy-all)
-- `optimizer = false` only for deploy-all-v6 (stack-too-deep with optimization)
+**Optional sections (add only when needed):**
+- `[rpc_endpoints]` — repos with fork tests. Maps named endpoints to env vars (e.g. `ethereum = "${RPC_ETHEREUM_MAINNET}"`).
+- `[profile.ci_sizes]` — only when CI needs different optimizer settings than defaults for the size check step (e.g. `optimizer_runs = 200` when the default profile uses a lower value).
+
+**Common variations:**
+- `via_ir = true` when hitting stack-too-deep
+- `optimizer = false` when optimization causes stack-too-deep
+- `optimizer_runs` reduced when deep struct nesting causes stack-too-deep at 200 runs
 
 ### CI Workflows
 
@@ -387,8 +370,10 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
       - name: Run tests
         run: forge test --fail-fast --summary --detailed --skip "*/script/**"
+        env:
+          RPC_ETHEREUM_MAINNET: ${{ secrets.RPC_ETHEREUM_MAINNET }}
       - name: Check contract sizes
-        run: FOUNDRY_PROFILE=ci_sizes forge build --sizes --skip "*/test/**" --skip "*/script/**" --skip SphinxUtils
+        run: forge build --sizes --skip "*/test/**" --skip "*/script/**" --skip SphinxUtils
 ```
 
 **lint.yml:**
@@ -410,11 +395,60 @@ jobs:
         run: forge fmt --check
 ```
 
+**slither.yml** (repos with `src/` contracts only):
+```yaml
+name: slither
+on:
+    pull_request:
+      branches:
+        - main
+    push:
+      branches:
+        - main
+jobs:
+  analyze:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - name: Install npm dependencies
+        run: npm install --omit=dev
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+      - name: Run slither
+        uses: crytic/slither-action@v0.3.1
+        with:
+            slither-config: slither-ci.config.json
+            fail-on: medium
+```
+
+**slither-ci.config.json:**
+```json
+{
+  "detectors_to_exclude": "timestamp,uninitialized-local,naming-convention,solc-version,shadowing-local",
+  "exclude_informational": true,
+  "exclude_low": false,
+  "exclude_medium": false,
+  "exclude_high": false,
+  "disable_color": false,
+  "filter_paths": "(mocks/|test/|node_modules/|lib/)",
+  "legacy_ast": false
+}
+```
+
+**Variations:**
+- Deployer-only repos (no `src/`, only `script/`) skip slither entirely — the action's internal `forge build` skips `test/` and `script/` by default, leaving nothing to compile.
+- Use inline `// slither-disable-next-line <detector>` to suppress known false positives rather than adding to `detectors_to_exclude` in the config. The comment must be on the line immediately before the flagged expression.
+
 ### package.json
 
 ```json
 {
-  "name": "@bananapus/router-terminal-v6",
+  "name": "@bananapus/package-name-v6",
   "version": "x.x.x",
   "license": "MIT",
   "repository": { "type": "git", "url": "git+https://github.com/Org/repo.git" },
@@ -434,13 +468,62 @@ jobs:
 
 ### remappings.txt
 
-Every repo has a `remappings.txt`. Minimal content:
+Every repo has a `remappings.txt` as the **single source of truth** for import remappings. Never add remappings to `foundry.toml`.
+
+**Principle:** Import paths in Solidity source must match npm package names exactly. With `libs = ["node_modules", "lib"]`, Foundry auto-resolves `@scope/package/path/File.sol` → `node_modules/@scope/package/path/File.sol`. No remapping needed for packages installed as real directories.
+
+**Note:** Auto-resolution does **not** work for symlinked packages (e.g. npm workspace links). Workspace repos like `deploy-all-v6` and `nana-cli-v6` need explicit `@scope/package/=node_modules/@scope/package/` remappings for each symlinked dependency.
+
+**Minimal content** (most repos):
 
 ```
-@sphinx-labs/contracts/=lib/sphinx/packages/contracts/contracts/foundry
+forge-std/=lib/forge-std/src/
 ```
 
-Additional mappings as needed for repo-specific dependencies.
+Only add extra remappings for:
+- **`forge-std`** — always needed (git submodule with `src/` subdirectory)
+- **Repo-specific `lib/` submodules** that have no npm package (e.g., `hookmate/=lib/hookmate/src/`)
+- **Symlinked npm packages** — need explicit `@scope/package/=node_modules/@scope/package/` entries
+- **Nested transitive deps** — e.g., `@chainlink/contracts-ccip/` nested inside `@bananapus/suckers-v6/node_modules/`
+
+**Never add remappings for:**
+- npm packages that match their import path and are installed as real directories — they auto-resolve
+- Short-form aliases (e.g., `@bananapus/core/` → `@bananapus/core-v6/src/`) — fix the import instead
+- Packages available via npm that are also git submodules — remove the submodule, use npm
+
+**Import path convention:**
+
+| Package | Import path | Resolves to |
+|---------|------------|-------------|
+| `@bananapus/core-v6` | `@bananapus/core-v6/src/libraries/JBConstants.sol` | `node_modules/@bananapus/core-v6/src/...` |
+| `@openzeppelin/contracts` | `@openzeppelin/contracts/token/ERC20/IERC20.sol` | `node_modules/@openzeppelin/contracts/...` |
+| `@uniswap/v4-core` | `@uniswap/v4-core/src/interfaces/IPoolManager.sol` | `node_modules/@uniswap/v4-core/src/...` |
+
+### Linting
+
+Solar (Foundry's built-in linter) runs automatically during `forge build`. It scans all `.sol` files in `libs` directories, including `node_modules`.
+
+**All test helpers must use relative imports** (e.g. `../../src/structs/JBRuleset.sol`), not bare `src/` imports. This ensures solar can resolve paths when the helper is consumed via npm in downstream repos.
+
+### Fork Tests
+
+Fork tests use named RPC endpoints defined in `[rpc_endpoints]` of `foundry.toml`. No skip guards — fork tests should hard-fail if the RPC endpoint is unavailable, making CI failures explicit.
+
+```solidity
+function setUp() public {
+    vm.createSelectFork("ethereum");
+    // ... setup code
+}
+```
+
+The endpoint name (e.g. `"ethereum"`) maps to an env var via `foundry.toml`:
+
+```toml
+[rpc_endpoints]
+ethereum = "${RPC_ETHEREUM_MAINNET}"
+```
+
+For multi-chain fork tests, add all needed endpoints.
 
 ### Formatting
 
@@ -468,4 +551,8 @@ CI checks formatting via `forge fmt --check`.
 
 ### Contract Size Checks
 
-CI runs `FOUNDRY_PROFILE=ci_sizes forge build --sizes` to catch contracts approaching the 24KB limit. The `ci_sizes` profile uses `optimizer_runs = 200` for realistic size measurement even when the default profile has different optimizer settings.
+CI runs `forge build --sizes` to catch contracts approaching the 24KB limit. When the repo's default `optimizer_runs` differs from what you want for size checking, use `FOUNDRY_PROFILE=ci_sizes forge build --sizes` with a `[profile.ci_sizes]` section in `foundry.toml`.
+
+## Repo-Specific Deviations
+
+None. This repo follows the standard configuration exactly.

package/foundry.toml

@@ -5,10 +5,6 @@ optimizer_runs = 200
 libs = ["node_modules", "lib"]
 fs_permissions = [{ access = "read-write", path = "./"}]
 
-[profile.ci_sizes]
-via_ir = true
-optimizer_runs = 200
-
 [fuzz]
 runs = 4096
 
@@ -21,3 +17,6 @@ fail_on_revert = false
 number_underscore = "thousands"
 multiline_func_header = "all"
 wrap_comments = true
+
+[rpc_endpoints]
+ethereum = "${RPC_ETHEREUM_MAINNET}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/router-terminal-v6",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -17,8 +17,9 @@
     "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'nana-router-terminal-v6'"
   },
   "dependencies": {
-    "@bananapus/core-v6": "^0.0.11",
-    "@openzeppelin/contracts": "^5.2.0",
+    "@bananapus/core-v6": "^0.0.15",
+    "@bananapus/permission-ids-v6": "^0.0.7",
+    "@openzeppelin/contracts": "^5.6.1",
     "@uniswap/permit2": "github:Uniswap/permit2",
     "@uniswap/v3-core": "github:Uniswap/v3-core#0.8",
     "@uniswap/v3-periphery": "github:Uniswap/v3-periphery#0.8",

package/script/Deploy.s.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.26;
 
 import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
 
-import {Sphinx} from "@sphinx-labs/contracts/SphinxPlugin.sol";
+import {Sphinx} from "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
 import {Script} from "forge-std/Script.sol";
 
 import {JBRouterTerminal} from "../src/JBRouterTerminal.sol";

package/script/helpers/RouterTerminalDeploymentLib.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.26;
 import {stdJson} from "forge-std/Script.sol";
 import {Vm} from "forge-std/Vm.sol";
 
-import {SphinxConstants, NetworkInfo} from "@sphinx-labs/contracts/SphinxConstants.sol";
+import {SphinxConstants, NetworkInfo} from "@sphinx-labs/contracts/contracts/foundry/SphinxConstants.sol";
 
 import {IJBRouterTerminal} from "../../src/interfaces/IJBRouterTerminal.sol";
 import {IJBRouterTerminalRegistry} from "../../src/interfaces/IJBRouterTerminalRegistry.sol";

package/src/JBRouterTerminal.sol

@@ -223,7 +223,10 @@ contract JBRouterTerminal is
         override
         returns (PoolInfo memory pool)
     {
-        return _discoverPool(normalizedTokenIn, normalizedTokenOut);
+        pool = _discoverPool(normalizedTokenIn, normalizedTokenOut);
+        if (!pool.isV4 && address(pool.v3Pool) == address(0)) {
+            revert JBRouterTerminal_NoPoolFound(normalizedTokenIn, normalizedTokenOut);
+        }
     }
 
     /// @notice Public wrapper for V3-only _discoverPool, useful for off-chain queries.
@@ -240,6 +243,9 @@ contract JBRouterTerminal is
         returns (IUniswapV3Pool pool)
     {
         PoolInfo memory info = _discoverPool(normalizedTokenIn, normalizedTokenOut);
+        if (!info.isV4 && address(info.v3Pool) == address(0)) {
+            revert JBRouterTerminal_NoPoolFound(normalizedTokenIn, normalizedTokenOut);
+        }
         if (!info.isV4) pool = info.v3Pool;
     }
 
@@ -277,6 +283,11 @@ contract JBRouterTerminal is
         return ERC2771Context._msgSender();
     }
 
+    /// @notice Normalize a token address by replacing the native token sentinel with WETH.
+    function _normalize(address token) internal view returns (address) {
+        return token == JBConstants.NATIVE_TOKEN ? address(WETH) : token;
+    }
+
     //*********************************************************************//
     // ---------------------- external transactions ---------------------- //
     //*********************************************************************//
@@ -392,8 +403,8 @@ contract JBRouterTerminal is
         (, address tokenIn, address tokenOut) = abi.decode(data, (uint256, address, address));
 
         // Normalize tokens (wrap native token if needed).
-        address normalizedTokenIn = tokenIn == JBConstants.NATIVE_TOKEN ? address(WETH) : tokenIn;
-        address normalizedTokenOut = tokenOut == JBConstants.NATIVE_TOKEN ? address(WETH) : tokenOut;
+        address normalizedTokenIn = _normalize(tokenIn);
+        address normalizedTokenOut = _normalize(tokenOut);
 
         // Verify caller is a legitimate pool via the factory.
         uint24 fee = IUniswapV3Pool(msg.sender).fee();
@@ -553,37 +564,9 @@ contract JBRouterTerminal is
     /// @param tokenB The other token in the pair.
     /// @return bestLiquidity The highest liquidity found, or 0 if no pool exists.
     function _bestPoolLiquidity(address tokenA, address tokenB) internal view returns (uint128 bestLiquidity) {
-        // Search V3.
-        for (uint256 i; i < 4; i++) {
-            // slither-disable-next-line calls-loop
-            address poolAddr = FACTORY.getPool(tokenA, tokenB, _FEE_TIERS[i]);
-            if (poolAddr == address(0)) continue;
-
-            // slither-disable-next-line calls-loop
-            uint128 liquidity = IUniswapV3Pool(poolAddr).liquidity();
-            if (liquidity > bestLiquidity) bestLiquidity = liquidity;
-        }
-
-        // Search V4 — reuse _discoverV4Pool with current best.
-        PoolInfo memory v4Result = _discoverV4Pool(
-            tokenA,
-            tokenB,
-            bestLiquidity,
-            PoolInfo({
-                isV4: false,
-                v3Pool: IUniswapV3Pool(address(0)),
-                v4Key: PoolKey({
-                    currency0: Currency.wrap(address(0)),
-                    currency1: Currency.wrap(address(0)),
-                    fee: 0,
-                    tickSpacing: 0,
-                    hooks: IHooks(address(0))
-                })
-            })
-        );
-        if (v4Result.isV4) {
-            bestLiquidity = POOL_MANAGER.getLiquidity(v4Result.v4Key.toId());
-        }
+        PoolInfo memory pool = _discoverPool(tokenA, tokenB);
+        if (pool.isV4) return POOL_MANAGER.getLiquidity(pool.v4Key.toId());
+        if (address(pool.v3Pool) != address(0)) return pool.v3Pool.liquidity();
     }
 
     /// @notice The maximum number of cashout iterations before reverting. Prevents infinite loops from circular
@@ -687,8 +670,8 @@ contract JBRouterTerminal is
         // Exact same token — no conversion needed.
         if (tokenIn == tokenOut) return amount;
 
-        address nIn = tokenIn == JBConstants.NATIVE_TOKEN ? address(WETH) : tokenIn;
-        address nOut = tokenOut == JBConstants.NATIVE_TOKEN ? address(WETH) : tokenOut;
+        address nIn = _normalize(tokenIn);
+        address nOut = _normalize(tokenOut);
 
         if (nIn == nOut) {
             // Same underlying token — just wrap or unwrap.
@@ -721,7 +704,7 @@ contract JBRouterTerminal is
         view
         returns (address tokenOut, IJBTerminal destTerminal)
     {
-        address normalizedTokenIn = tokenIn == JBConstants.NATIVE_TOKEN ? address(WETH) : tokenIn;
+        address normalizedTokenIn = _normalize(tokenIn);
         IJBTerminal[] memory terminals = DIRECTORY.terminalsOf(projectId);
 
         uint128 bestLiquidity;
@@ -733,8 +716,7 @@ contract JBRouterTerminal is
 
             for (uint256 j; j < contexts.length; j++) {
                 address candidateToken = contexts[j].token;
-                address normalizedCandidate =
-                    candidateToken == JBConstants.NATIVE_TOKEN ? address(WETH) : candidateToken;
+                address normalizedCandidate = _normalize(candidateToken);
 
                 if (normalizedCandidate == normalizedTokenIn) continue;
 
@@ -801,10 +783,6 @@ contract JBRouterTerminal is
 
         // Search V4.
         bestPool = _discoverV4Pool(normalizedTokenIn, normalizedTokenOut, bestLiquidity, bestPool);
-
-        if (!bestPool.isV4 && address(bestPool.v3Pool) == address(0)) {
-            revert JBRouterTerminal_NoPoolFound(normalizedTokenIn, normalizedTokenOut);
-        }
     }
 
     /// @notice Search V4 vanilla pools and update bestPool if a V4 pool has higher liquidity.
@@ -1169,7 +1147,7 @@ contract JBRouterTerminal is
         internal
         returns (uint256 amountOut)
     {
-        address normalizedTokenIn = tokenIn == JBConstants.NATIVE_TOKEN ? address(WETH) : tokenIn;
+        address normalizedTokenIn = _normalize(tokenIn);
 
         // Snapshot the input token balance before the swap to compute the leftover delta accurately.
         uint256 balanceBefore = IERC20(normalizedTokenIn).balanceOf(address(this));
@@ -1177,7 +1155,7 @@ contract JBRouterTerminal is
         // Execute the swap in a scoped block to manage stack depth.
         amountOut = _executeSwap({
             normalizedTokenIn: normalizedTokenIn,
-            normalizedTokenOut: tokenOut == JBConstants.NATIVE_TOKEN ? address(WETH) : tokenOut,
+            normalizedTokenOut: _normalize(tokenOut),
             amount: amount,
             metadata: metadata,
             callbackData: abi.encode(projectId, tokenIn, tokenOut)
@@ -1231,6 +1209,9 @@ contract JBRouterTerminal is
     {
         // Discover the best pool across V3 and V4 fee tiers.
         pool = _discoverPool(normalizedTokenIn, normalizedTokenOut);
+        if (!pool.isV4 && address(pool.v3Pool) == address(0)) {
+            revert JBRouterTerminal_NoPoolFound(normalizedTokenIn, normalizedTokenOut);
+        }
 
         // Check for a user-provided quote.
         (bool exists, bytes memory quote) =

package/test/RouterTerminal.t.sol

@@ -94,9 +94,12 @@ contract RouterTerminalHarness is JBRouterTerminal {
     )
         external
         view
-        returns (PoolInfo memory)
+        returns (PoolInfo memory pool)
     {
-        return _discoverPool(normalizedTokenIn, normalizedTokenOut);
+        pool = _discoverPool(normalizedTokenIn, normalizedTokenOut);
+        if (!pool.isV4 && address(pool.v3Pool) == address(0)) {
+            revert JBRouterTerminal_NoPoolFound(normalizedTokenIn, normalizedTokenOut);
+        }
     }
 }
 

package/test/RouterTerminalFeeCashOutFork.t.sol

@@ -111,12 +111,7 @@ contract RouterTerminalFeeCashOutForkTest is Test {
     // ──────────────────────────
 
     function setUp() public {
-        string memory rpcUrl = vm.envOr("RPC_ETHEREUM_MAINNET", string(""));
-        if (bytes(rpcUrl).length == 0) {
-            vm.skip(true);
-            return;
-        }
-        vm.createSelectFork(rpcUrl, BLOCK_NUMBER);
+        vm.createSelectFork("ethereum", BLOCK_NUMBER);
 
         _deployJBCore();
 

package/test/RouterTerminalFork.t.sol

@@ -94,13 +94,7 @@ contract RouterTerminalForkTest is Test {
     // ──────────────────────────────────────
 
     function setUp() public {
-        // Skip fork tests in CI when no RPC URL is configured.
-        string memory rpcUrl = vm.envOr("RPC_ETHEREUM_MAINNET", string(""));
-        if (bytes(rpcUrl).length == 0) {
-            vm.skip(true);
-            return;
-        }
-        vm.createSelectFork(rpcUrl, BLOCK_NUMBER);
+        vm.createSelectFork("ethereum", BLOCK_NUMBER);
 
         // Deploy all JB core contracts fresh within the fork.
         _deployJBCore();

package/test/RouterTerminalSandwichFork.t.sol

@@ -305,12 +305,7 @@ contract RouterTerminalSandwichForkTest is Test {
     //*********************************************************************//
 
     function setUp() public {
-        string memory rpcUrl = vm.envOr("RPC_ETHEREUM_MAINNET", string(""));
-        if (bytes(rpcUrl).length == 0) {
-            vm.skip(true);
-            return;
-        }
-        vm.createSelectFork(rpcUrl, BLOCK_NUMBER);
+        vm.createSelectFork("ethereum", BLOCK_NUMBER);
 
         _deployJBCore();
 

package/test/regression/{L30_CashOutLoopLimit.t.sol → CashOutLoopLimit.t.sol}

@@ -51,7 +51,7 @@ contract MockToken {
 
 /// @notice _cashOutLoop should revert with CashOutLoopLimit when circular token
 /// dependencies cause more than 20 iterations, instead of consuming all gas.
-contract L30_CashOutLoopLimitTest is Test {
+contract CashOutLoopLimitTest is Test {
     JBRouterTerminal routerTerminal;
 
     IJBDirectory directory = IJBDirectory(makeAddr("directory"));

package/test/regression/{L29_LockTerminalRace.t.sol → LockTerminalRace.t.sol}

@@ -13,7 +13,7 @@ import {IPermit2} from "@uniswap/permit2/src/interfaces/IPermit2.sol";
 import {JBRouterTerminalRegistry} from "../../src/JBRouterTerminalRegistry.sol";
 
 /// @notice lockTerminalFor should revert if current terminal doesn't match expected.
-contract L29_LockTerminalRaceTest is Test {
+contract LockTerminalRaceTest is Test {
     JBRouterTerminalRegistry registry;
 
     IJBPermissions permissions = IJBPermissions(makeAddr("permissions"));

package/test/regression/{M3_V4SpotPriceSlippage.t.sol → V4SpotPriceSlippage.t.sol}

@@ -37,7 +37,7 @@ contract SwapLibHarness {
 /// Because setting up a full V4 PoolManager in unit tests requires significant infrastructure, these tests
 /// exercise the slippage math in isolation via JBSwapLib, which is the same code path used by
 /// `_getV4SpotQuote` and `_getV3TwapQuote`.
-contract M3_V4SpotPriceSlippageTest is Test {
+contract V4SpotPriceSlippageTest is Test {
     SwapLibHarness lib;
 
     /// @notice The same constants from JBSwapLib / JBRouterTerminal.