Rebase

packages/contracts-bedrock/scripts/restructure_tests.py

@@ -2,7 +2,7 @@ import os
 import shutil
 
 
-def mimic_directory_structure(src_folder, test_folder):
+def mimic_directory_structure(src_folder: str, test_folder: str) -> None:
     """
     This function takes a source folder and a test folder as input, and restructures
     the test folder to match the directory structure of the source folder.

packages/contracts-bedrock/test/OutputBisectionGame.t.sol → packages/contracts-bedrock/test/dispute/OutputBisectionGame.t.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.15;
 
 import { Test } from "forge-std/Test.sol";
 import { Vm } from "forge-std/Vm.sol";
-import { DisputeGameFactory_Init } from "test/DisputeGameFactory.t.sol";
+import { DisputeGameFactory_Init } from "test/dispute/DisputeGameFactory.t.sol";
 import { DisputeGameFactory } from "src/dispute/DisputeGameFactory.sol";
 import { OutputBisectionGame } from "src/dispute/OutputBisectionGame.sol";
 import { L2OutputOracle } from "src/L1/L2OutputOracle.sol";