Updates from Shaks comments.

BalancerMaxis · Jul 27, 2023 · 5a75aa6 · 5a75aa6
1 parent 856ad01
commit 5a75aa6
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # 0.8.0
-added andd dotmaps + permissions
+Added extra Munch based explorable dotmaps + permissions
+Restructured function returns to be more consistent.
 # 0.6.0
 Use new balancer deployments repo.
 # 0.4.0

diff --git a/bal_addresses/__init__.py b/bal_addresses/__init__.py
@@ -1,3 +1,3 @@
 from .addresses import AddrBook, GITHUB_DEPLOYMENTS_RAW, GITHUB_DEPLOYMENTS_NICE, GITHUB_RAW_OUTPUTS, GITHUB_RAW_EXTRAS
 from .permissions import BalPermissions
-from .errors import Errors
+from .errors import MultipleMatchesError, NoResultError
diff --git a/bal_addresses/addresses.py b/bal_addresses/addresses.py
@@ -1,5 +1,5 @@
 import json
-from .errors import Errors
+from .errors import MultipleMatchesError, NoResultError
 from typing import Dict
 from typing import Optional
 
@@ -141,16 +141,16 @@ def populate_multisigs(self) -> None:
             self._multisigs = Munch.fromDict(msigs[self.chain])
         else:
             print(f"Warning: No multisigs for chain {self.chain}, multisigs must be added in extras/multisig.json")
-            self._multisigs = {}
+            self._multisigs = Munch
 
 
 
     def search_unique(self, substr):
         results = [s for s in self.flatbook.keys() if substr in s]
         if len(results) > 1:
-            raise Errors.MultipleMatchesError(f"{substr} Multiple matches found: {results}")
+            raise MultipleMatchesError(f"{substr} Multiple matches found: {results}")
         if len(results) < 1:
-            raise Errors.NoResultError(f"{substr}")
+            raise NoResultError(f"{substr}")
         return Munch.fromDict({
             "path": results[0],
             "address": self.flatbook[results[0]]
@@ -159,9 +159,9 @@ def search_unique(self, substr):
     def search_unique_deployment(self, substr):
         results = [s for s in self.deployments_only.keys() if substr in s]
         if len(results) > 1:
-            raise Errors.MultipleMatchesError(f"{substr} Multiple matches found: {results}")
+            raise MultipleMatchesError(f"{substr} Multiple matches found: {results}")
         if len(results) < 1:
-            raise Errors.NoResultError(f"{substr}")
+            raise NoResultError(f"{substr}")
         return Munch.fromDict({
             "deployment": results[0],
             "addresses_by_contract": self.deployments_only[results[0]]
@@ -183,7 +183,7 @@ def latest_contract(self, contract_name):
             if contract_name in contractData.keys():
                 deployments.append(deployment)
         if len(deployments) == 0:
-            raise Errors.NoResultError(contract_name)
+            raise NoResultError(contract_name)
         deployments.sort(reverse=True)
         address =  self.deployments_only[deployments[0]][contract_name]
         return Munch.fromDict({

diff --git a/bal_addresses/errors.py b/bal_addresses/errors.py
@@ -1,8 +1,6 @@
 
-class Errors():
+class MultipleMatchesError(Exception):
+    pass
 
-    class MultipleMatchesError(Exception):
-        pass
-
-    class NoResultError(Exception):
-        pass
+class NoResultError(Exception):
+    pass
diff --git a/bal_addresses/permissions.py b/bal_addresses/permissions.py
@@ -1,4 +1,4 @@
-from .errors import Errors
+from .errors import NoResultError, MultipleMatchesError
 import requests
 from dotmap import DotMap
 from bal_addresses import AddrBook, GITHUB_DEPLOYMENTS_RAW, GITHUB_RAW_OUTPUTS
@@ -53,9 +53,9 @@ def search_many_paths_by_unique_deployment(self, deployment_substr, fx_substr) -
     def search_unique_path_by_unique_deployment(self, deployment_substr, fx_substr) -> dict[str, str]:
         results = self.search_many_paths_by_unique_deployment(deployment_substr, fx_substr)
         if len(results) > 1:
-            raise Errors.MultipleMatchesError(f"{fx_substr} Multiple matches found: {results}")
+            raise MultipleMatchesError(f"{fx_substr} Multiple matches found: {results}")
         if len(results) < 1:
-            raise Errors.NoResultError(f"{fx_substr}")
+            raise NoResultError(f"{fx_substr}")
         return results[0]
 
     def needs_authorizer(self, contract, deployment) -> bool:
@@ -65,14 +65,14 @@ def allowed_addresses(self, action_id) -> list[str]:
         try:
             return self.active_permissions_by_action_id[action_id]
         except KeyError:
-            raise Errors.NoResultError(f"{action_id} has no authorized callers")
+            raise NoResultError(f"{action_id} has no authorized callers")
 
     def allowed_caller_names(self, action_id) -> list[str]:
         a = AddrBook(self.chain)
         try:
             addresslist = self.active_permissions_by_action_id[action_id]
         except KeyError:
-            raise Errors.NoResultError(f"{action_id} has no authorized callers")
+            raise NoResultError(f"{action_id} has no authorized callers")
         names = [a.flatbook.get(item, 'undef') for item in addresslist]
         return names