fix broken tests. (#91)

* fix broken tests. * fix broken tests. --------- Co-authored-by: BIP Bot <[email protected]>
BalancerMaxis · Jul 29, 2023 · 9da8f16 · 9da8f16
1 parent 9a0a50d
commit 9da8f16
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/bal_addresses/addresses.py b/bal_addresses/addresses.py
@@ -142,7 +142,7 @@ def populate_extras(self) -> None:
         if chain_extras.ok:
             self._extras = Munch.fromDict(self.checksum_address_dict(chain_extras.json()))
         else:
-            print(f"Warning: No extras for chain {self.chain}, multisigs must be added in extras/chain.json")
+            print(f"Warning: No extras for chain {self.chain}, extras must be added in extras/chain.json")
             self._extras = Munch.fromDict({})
     def populate_eoas(self) -> None:
         eoas = requests.get(
@@ -217,12 +217,16 @@ def checksum_address_dict(addresses):
         """
         checksummed = {}
         for k, v in addresses.items():
-            if isinstance(v, str):
-                checksummed[k] = Web3.toChecksumAddress(v)
-            elif isinstance(v, dict):
+            if isinstance(v, dict):
                 checksummed[k] = checksum_address_dict(v)
+            elif isinstance(v, str):
+                try:
+                    checksummed[k] = Web3.toChecksumAddress(v)
+                except:
+                    checksummed[k] = v
             else:
                 print(k, v, "formatted incorrectly")
+                checksummed[k] = v
         return checksummed
 
     def flatten_dict(self, d, parent_key='', sep='/'):
@@ -259,10 +263,14 @@ def checksum_address_dict(addresses):
     """
     checksummed = {}
     for k, v in addresses.items():
-        if isinstance(v, str):
-            checksummed[k] = Web3.toChecksumAddress(v)
-        elif isinstance(v, dict):
+        if isinstance(v, dict):
             checksummed[k] = checksum_address_dict(v)
+        elif isinstance(v, str):
+            try:
+                checksummed[k] = Web3.toChecksumAddress(v)
+            except:
+                checksummed[k] = v
         else:
             print(k, v, "formatted incorrectly")
+            checksummed[k] = v
     return checksummed
diff --git a/tests/test_addresses.py b/tests/test_addresses.py
@@ -132,9 +132,10 @@ def test_deployments_invalid_format():
     a.populate_deployments()
     assert a.deployments.vault.contracts.name == "Vault"
     a.populate_extras()
+    print(a.extras.vault.status)
     assert a.extras.vault.status == "ACTIVE"
     a.populate_multisigs()
-    assert a.multisigs.status == "ACTIVE"
+    assert str(a.multisigs.status) == "ACTIVE"
 
 
 @responses.activate
@@ -172,9 +173,9 @@ def test_deployments_not_populated():
     assert a.deployments is None
     with pytest.raises(AttributeError):
         assert a.deployments.vault.non_existing_attribute
-    assert a.extras is None
+    assert a.extras == {}
     with pytest.raises(AttributeError):
         assert a.extras.non_existing_attribute
-    assert a.multisigs is None
+    assert a.multisigs == {}
     with pytest.raises(AttributeError):
         assert a.multisigs.non_existing_attribute