From 584a6c7741a473b22ba6503001147a1f21ee5e3b Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 8 Feb 2022 21:18:05 +0000
Subject: [PATCH] Transpile 5a081475

---
 scripts/upgradeable/patch/.gitkeep            |  0
 .../patch/02-add-missing-mock-arguments.patch | 13 -------
 .../patch/05-fix-governor-initializers.patch  | 39 -------------------
 scripts/upgradeable/transpile.sh              |  7 ++--
 4 files changed, 4 insertions(+), 55 deletions(-)
 create mode 100644 scripts/upgradeable/patch/.gitkeep
 delete mode 100644 scripts/upgradeable/patch/02-add-missing-mock-arguments.patch
 delete mode 100644 scripts/upgradeable/patch/05-fix-governor-initializers.patch

diff --git a/scripts/upgradeable/patch/.gitkeep b/scripts/upgradeable/patch/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/scripts/upgradeable/patch/02-add-missing-mock-arguments.patch b/scripts/upgradeable/patch/02-add-missing-mock-arguments.patch
deleted file mode 100644
index 74fc7bdb2..000000000
--- a/scripts/upgradeable/patch/02-add-missing-mock-arguments.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/contracts/mocks/MulticallTokenMockUpgradeable.sol b/contracts/mocks/MulticallTokenMockUpgradeable.sol
-index 7bd4ae88..7be0c4ff 100644
---- a/contracts/mocks/MulticallTokenMockUpgradeable.sol
-+++ b/contracts/mocks/MulticallTokenMockUpgradeable.sol
-@@ -8,7 +8,7 @@ import "../proxy/utils/Initializable.sol";
- 
- contract MulticallTokenMockUpgradeable is Initializable, ERC20MockUpgradeable, MulticallUpgradeable {
-     function __MulticallTokenMock_init(uint256 initialBalance) internal onlyInitializing {
--        __ERC20_init_unchained(name, symbol);
-+        __ERC20_init_unchained("MulticallToken", "BCT");
-         __ERC20Mock_init_unchained("MulticallToken", "BCT", msg.sender, initialBalance);
-     }
- 
diff --git a/scripts/upgradeable/patch/05-fix-governor-initializers.patch b/scripts/upgradeable/patch/05-fix-governor-initializers.patch
deleted file mode 100644
index f0e98f4b2..000000000
--- a/scripts/upgradeable/patch/05-fix-governor-initializers.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
-index 66662e9e..c53c6479 100644
---- a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
-+++ b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
-@@ -16,7 +16,7 @@ contract MyGovernor1Upgradeable is
-     GovernorCountingSimpleUpgradeable
- {
-     function __MyGovernor1_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
--        __EIP712_init_unchained(name_, version());
-+        __EIP712_init_unchained("MyGovernor", version());
-         __Governor_init_unchained("MyGovernor");
-         __GovernorTimelockControl_init_unchained(_timelock);
-         __GovernorVotes_init_unchained(_token);
-diff --git a/contracts/mocks/wizard/MyGovernor2Upgradeable.sol b/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
-index 63bc024c..0f854226 100644
---- a/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
-+++ b/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
-@@ -18,7 +18,7 @@ contract MyGovernor2Upgradeable is
-     GovernorCountingSimpleUpgradeable
- {
-     function __MyGovernor2_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
--        __EIP712_init_unchained(name_, version());
-+        __EIP712_init_unchained("MyGovernor", version());
-         __Governor_init_unchained("MyGovernor");
-         __GovernorTimelockControl_init_unchained(_timelock);
-         __GovernorVotes_init_unchained(_token);
-diff --git a/contracts/mocks/wizard/MyGovernor3Upgradeable.sol b/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
-index 27a8411c..2f59b8e5 100644
---- a/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
-+++ b/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
-@@ -16,7 +16,7 @@ contract MyGovernorUpgradeable is
-     GovernorVotesQuorumFractionUpgradeable
- {
-     function __MyGovernor_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
--        __EIP712_init_unchained(name_, version());
-+        __EIP712_init_unchained("MyGovernor", version());
-         __Governor_init_unchained("MyGovernor");
-         __GovernorTimelockControl_init_unchained(_timelock);
-         __GovernorVotes_init_unchained(_token);
diff --git a/scripts/upgradeable/transpile.sh b/scripts/upgradeable/transpile.sh
index 1e0b6fd4e..92759896f 100644
--- a/scripts/upgradeable/transpile.sh
+++ b/scripts/upgradeable/transpile.sh
@@ -17,6 +17,7 @@ npx @openzeppelin/upgrade-safe-transpiler@latest -D \
   -x '!contracts/proxy/beacon/IBeacon.sol' \
   -p 'contracts/**/presets/**/*'
 
-for p in scripts/upgradeable/patch/*.patch; do
-  git apply "$p"
-done
+# this is currently no longer used but could be useful again in the future
+# for p in scripts/upgradeable/patch/*.patch; do
+#   git apply "$p"
+# done