From 3ee59a5a5421c6bd9a4e67d5acebf7d24e014e41 Mon Sep 17 00:00:00 2001
From: Edmund Edgar <ed@socialminds.jp>
Date: Sat, 24 Feb 2024 06:44:17 +0000
Subject: [PATCH] Remove all the remappings and git submodules except the
 standard forge-std, forge should load them from npm instead

---
 .gitmodules                            | 9 ---------
 lib/openzeppelin-contracts             | 1 -
 lib/openzeppelin-contracts-upgradeable | 1 -
 lib/zkevm-contracts                    | 1 -
 remappings.txt                         | 5 +----
 5 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 160000 lib/openzeppelin-contracts
 delete mode 160000 lib/openzeppelin-contracts-upgradeable
 delete mode 160000 lib/zkevm-contracts

diff --git a/.gitmodules b/.gitmodules
index 8ee9fba9..888d42dc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,3 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "lib/openzeppelin-contracts-upgradeable"]
-	path = lib/openzeppelin-contracts-upgradeable
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
-[submodule "lib/zkevm-contracts"]
-	path = lib/zkevm-contracts
-	url = https://github.com/RealityETH/zkevm-contracts
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
deleted file mode 160000
index d00acef4..00000000
--- a/lib/openzeppelin-contracts
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d00acef4059807535af0bd0dd0ddf619747a044b
diff --git a/lib/openzeppelin-contracts-upgradeable b/lib/openzeppelin-contracts-upgradeable
deleted file mode 160000
index bc95521e..00000000
--- a/lib/openzeppelin-contracts-upgradeable
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bc95521e34dcd49792065e264a7ad2b5a86f0091
diff --git a/lib/zkevm-contracts b/lib/zkevm-contracts
deleted file mode 160000
index c169730b..00000000
--- a/lib/zkevm-contracts
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c169730bc37328f52a91497dee0aba3983aff376
diff --git a/remappings.txt b/remappings.txt
index 8f760b04..1076a425 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1,5 +1,2 @@
 ds-test/=lib/forge-std/lib/ds-test/src/
-forge-std/=lib/forge-std/src/
-@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
-@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
-@RealityETH/zkevm-contracts/=lib/zkevm-contracts/
\ No newline at end of file
+forge-std/=lib/forge-std/src/
\ No newline at end of file