refactor(Tests): use more streamlined approach for adding accys in tests

Author: fubuloubu

tests/conftest.py

@@ -41,22 +41,29 @@ def sponsor(project, owner):
 @pytest.fixture(scope="session")
 def encode_accessory_data():
     def encode_accessory_data(
-        accessory: ContractInstance, *methods: str | ContractMethodHandler
+        *methods: str | ContractMethodHandler,
+        accessory: ContractInstance | None = None,
     ) -> list[dict]:
-        selectors = []
-
-        for method in methods:
-            if isinstance(method, ContractMethodHandler):
-                selectors.extend(abi.selector for abi in method.abis)
-            else:
-                selectors.append(method)
-
-        return [
-            dict(
-                accessory=accessory,
-                method=accessory.contract_type.method_identifiers.get(method_id),
-            )
-            for method_id in selectors
-        ]
+        if accessory:
+            return [
+                dict(
+                    accessory=accessory,
+                    method=method,
+                )
+                for method in methods
+            ]
+
+        else:
+            return [
+                dict(
+                    accessory=method.contract,
+                    method=method.contract.contract_type.method_identifiers.get(
+                        abi.selector
+                    ),
+                )
+                for method in methods
+                if not isinstance(method, str)
+                for abi in method.abis
+            ]
 
     return encode_accessory_data

tests/test_create.py

@@ -9,9 +9,6 @@ def purse(singleton, owner, create2_deployer, encode_accessory_data):
         # NOTE: Add multicall as an accessory at the same time
         data=singleton.update_accessories.encode_input(
             encode_accessory_data(
-                # Accessory
-                create2_deployer,
-                # Methods
                 create2_deployer.create,
             )
         ),

tests/test_multicall.py

@@ -8,12 +8,7 @@ def purse(singleton, owner, multicall, encode_accessory_data):
         singleton,
         # NOTE: Add multicall as an accessory at the same time
         data=singleton.update_accessories.encode_input(
-            encode_accessory_data(
-                # Accessory
-                multicall,
-                # Methods
-                multicall.execute,
-            )
+            encode_accessory_data(multicall.execute)
         ),
     ) as purse:
         yield purse

tests/test_sponsor.py

@@ -9,9 +9,6 @@ def purse(singleton, owner, sponsor, encode_accessory_data):
         # NOTE: Add multicall as an accessory at the same time
         data=singleton.update_accessories.encode_input(
             encode_accessory_data(
-                # Accessory
-                sponsor,
-                # Methods
                 sponsor.sponsor_nonce,
                 sponsor.sponsor,
             )

tests/test_wallet.py

@@ -17,7 +17,7 @@ def test_can_transfer(purse, accounts):
 
 def test_add_rm_accessory(owner, purse, multicall, encode_accessory_data):
     # TODO: Add `.method_id(args_str)` to `ContractMethodHandler`
-    accessory_data = encode_accessory_data(multicall, multicall.execute)
+    accessory_data = encode_accessory_data(multicall.execute)
     method_id = accessory_data[0]["method"]
     assert purse.accessoryByMethodId(method_id) == ZERO_ADDRESS