refactor: remove unnecessary internal

Now that contracts are more stable and we know which variable do and do not need to be virtualized, no need to waste lines of code and/or add complexity with functions that just expose internal variables with the exact same name.
m0-foundation · Nov 28, 2023 · e817e13 · e817e13
1 parent c84f9bb
commit e817e13
Show file tree

Hide file tree

Showing 52 changed files with 284 additions and 431 deletions.
diff --git a/abi/ERC20PermitHarness.json b/abi/ERC20PermitHarness.json
@@ -237,7 +237,7 @@
     "outputs": [
       {
         "internalType": "uint8",
-        "name": "decimals_",
+        "name": "",
         "type": "uint8"
       }
     ],
@@ -391,7 +391,7 @@
     "outputs": [
       {
         "internalType": "string",
-        "name": "symbol_",
+        "name": "",
         "type": "string"
       }
     ],

diff --git a/abi/EmergencyGovernor.json b/abi/EmergencyGovernor.json
@@ -865,20 +865,20 @@
     "inputs": [
       {
         "internalType": "uint256",
-        "name": "proposalId_",
+        "name": "proposalId",
         "type": "uint256"
       },
       {
         "internalType": "address",
-        "name": "account_",
+        "name": "voter",
         "type": "address"
       }
     ],
     "name": "hasVoted",
     "outputs": [
       {
         "internalType": "bool",
-        "name": "hasVoted_",
+        "name": "hasVoted",
         "type": "bool"
       }
     ],
@@ -1099,7 +1099,7 @@
     "outputs": [
       {
         "internalType": "address",
-        "name": "registrar_",
+        "name": "",
         "type": "address"
       }
     ],
@@ -1156,7 +1156,7 @@
     "outputs": [
       {
         "internalType": "address",
-        "name": "standardGovernor_",
+        "name": "",
         "type": "address"
       }
     ],
@@ -1188,7 +1188,7 @@
     "outputs": [
       {
         "internalType": "uint16",
-        "name": "thresholdRatio_",
+        "name": "",
         "type": "uint16"
       }
     ],
@@ -1219,7 +1219,7 @@
     "outputs": [
       {
         "internalType": "address",
-        "name": "voteToken_",
+        "name": "",
         "type": "address"
       }
     ],
@@ -1258,7 +1258,7 @@
     "outputs": [
       {
         "internalType": "address",
-        "name": "zeroGovernor_",
+        "name": "",
         "type": "address"
       }
     ],

diff --git a/abi/EmergencyGovernorDeployer.json b/abi/EmergencyGovernorDeployer.json
@@ -34,7 +34,7 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "voteToken_",
+        "name": "powerToken_",
         "type": "address"
       },
       {
@@ -61,7 +61,7 @@
   },
   {
     "inputs": [],
-    "name": "getNextDeploy",
+    "name": "nextDeploy",
     "outputs": [
       {
         "internalType": "address",

diff --git a/abi/PowerBootstrapToken.json b/abi/PowerBootstrapToken.json
@@ -40,7 +40,7 @@
       },
       {
         "internalType": "uint256",
-        "name": "epoch_",
+        "name": "",
         "type": "uint256"
       }
     ],
@@ -59,7 +59,7 @@
     "inputs": [
       {
         "internalType": "uint256",
-        "name": "epoch_",
+        "name": "",
         "type": "uint256"
       }
     ],

diff --git a/abi/PowerToken.json b/abi/PowerToken.json
@@ -3,7 +3,7 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "governor_",
+        "name": "standardGovernor_",
         "type": "address"
       },
       {
@@ -82,7 +82,7 @@
   },
   {
     "inputs": [],
-    "name": "NotGovernor",
+    "name": "NotStandardGovernor",
     "type": "error"
   },
   {
@@ -390,7 +390,7 @@
     "outputs": [
       {
         "internalType": "uint256",
-        "name": "activeEpochs_",
+        "name": "",
         "type": "uint256"
       }
     ],
@@ -560,7 +560,7 @@
     "outputs": [
       {
         "internalType": "uint256",
-        "name": "bootstrapEpoch_",
+        "name": "",
         "type": "uint256"
       }
     ],
@@ -573,7 +573,7 @@
     "outputs": [
       {
         "internalType": "address",
-        "name": "bootstrapToken_",
+        "name": "",
         "type": "address"
       }
     ],
@@ -630,7 +630,7 @@
     "outputs": [
       {
         "internalType": "uint8",
-        "name": "decimals_",
+        "name": "",
         "type": "uint8"
       }
     ],
@@ -817,19 +817,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "governor",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "governor_",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -955,7 +942,7 @@
     "outputs": [
       {
         "internalType": "uint256",
-        "name": "participationInflation_",
+        "name": "",
         "type": "uint256"
       }
     ],
@@ -1018,13 +1005,26 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "standardGovernor",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "symbol",
     "outputs": [
       {
         "internalType": "string",
-        "name": "symbol_",
+        "name": "",
         "type": "string"
       }
     ],
@@ -1165,7 +1165,7 @@
     "outputs": [
       {
         "internalType": "address",
-        "name": "vault_",
+        "name": "",
         "type": "address"
       }
     ],

diff --git a/abi/PowerTokenDeployer.json b/abi/PowerTokenDeployer.json
@@ -34,7 +34,7 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "governor_",
+        "name": "standardGovernor_",
         "type": "address"
       },
       {
@@ -61,7 +61,7 @@
   },
   {
     "inputs": [],
-    "name": "getNextDeploy",
+    "name": "nextDeploy",
     "outputs": [
       {
         "internalType": "address",

diff --git a/abi/StandardGovernor.json b/abi/StandardGovernor.json
@@ -559,7 +559,7 @@
     "outputs": [
       {
         "internalType": "address",
-        "name": "cashToken_",
+        "name": "",
         "type": "address"
       }
     ],
@@ -857,7 +857,7 @@
     "outputs": [
       {
         "internalType": "address",
-        "name": "emergencyGovernor_",
+        "name": "",
         "type": "address"
       }
     ],
@@ -975,20 +975,20 @@
     "inputs": [
       {
         "internalType": "uint256",
-        "name": "proposalId_",
+        "name": "proposalId",
         "type": "uint256"
       },
       {
         "internalType": "address",
-        "name": "account_",
+        "name": "voter",
         "type": "address"
       }
     ],
     "name": "hasVoted",
     "outputs": [
       {
         "internalType": "bool",
-        "name": "hasVoted_",
+        "name": "hasVoted",
         "type": "bool"
       }
     ],
@@ -1085,7 +1085,7 @@
     "outputs": [
       {
         "internalType": "uint256",
-        "name": "reward_",
+        "name": "",
         "type": "uint256"
       }
     ],
@@ -1192,7 +1192,7 @@
     "outputs": [
       {
         "internalType": "uint256",
-        "name": "proposalFee_",
+        "name": "",
         "type": "uint256"
       }
     ],
@@ -1296,7 +1296,7 @@
     "outputs": [
       {
         "internalType": "address",
-        "name": "registrar_",
+        "name": "",
         "type": "address"
       }
     ],
@@ -1408,7 +1408,7 @@
     "outputs": [
       {
         "internalType": "address",
-        "name": "vault_",
+        "name": "",
         "type": "address"
       }
     ],
@@ -1421,7 +1421,7 @@
     "outputs": [
       {
         "internalType": "address",
-        "name": "voteToken_",
+        "name": "",
         "type": "address"
       }
     ],
@@ -1460,7 +1460,7 @@
     "outputs": [
       {
         "internalType": "address",
-        "name": "zeroGovernor_",
+        "name": "",
         "type": "address"
       }
     ],
@@ -1473,7 +1473,7 @@
     "outputs": [
       {
         "internalType": "address",
-        "name": "zeroToken_",
+        "name": "",
         "type": "address"
       }
     ],

diff --git a/abi/StandardGovernorDeployer.json b/abi/StandardGovernorDeployer.json
@@ -54,7 +54,7 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "voteToken_",
+        "name": "powerToken_",
         "type": "address"
       },
       {
@@ -91,7 +91,7 @@
   },
   {
     "inputs": [],
-    "name": "getNextDeploy",
+    "name": "nextDeploy",
     "outputs": [
       {
         "internalType": "address",