Make auth tests more maintainable by improving fixture parameter usage.

nucypher/policy/conditions/auth.py

@@ -1,4 +1,5 @@
 from enum import Enum
+from typing import List
 
 from eth_account.account import Account
 from eth_account.messages import HexBytes, encode_typed_data
@@ -10,6 +11,10 @@ class Auth:
         EIP712 = "EIP712"
         SIWE = "SIWE"
 
+        @classmethod
+        def values(cls) -> List[str]:
+            return [scheme.value for scheme in cls]
+
     class InvalidData(Exception):
         pass
 

tests/acceptance/conditions/test_conditions.py

@@ -14,6 +14,7 @@ from nucypher.blockchain.eth.agents import (
     SubscriptionManagerAgent,
 )
 from nucypher.blockchain.eth.constants import NULL_ADDRESS
+from nucypher.policy.conditions.auth import Auth
 from nucypher.policy.conditions.context import (
     USER_ADDRESS_CONTEXT,
     _recover_user_address,
@@ -65,7 +66,7 @@ def test_required_context_variable(
 
 @pytest.mark.parametrize("expected_entry", ["address", "signature", "typedData"])
 @pytest.mark.parametrize(
-    "valid_user_address_context", ["EIP712", "SIWE"], indirect=True
+    "valid_user_address_context", Auth.AuthScheme.values(), indirect=True
 )
 def test_user_address_context_missing_required_entries(
     expected_entry, valid_user_address_context
@@ -77,7 +78,7 @@ def test_user_address_context_missing_required_entries(
 
 
 @pytest.mark.parametrize(
-    "valid_user_address_context", ["EIP712", "SIWE"], indirect=True
+    "valid_user_address_context", Auth.AuthScheme.values(), indirect=True
 )
 def test_user_address_context_invalid_typed_data(valid_user_address_context):
     # invalid typed data
@@ -90,7 +91,7 @@ def test_user_address_context_invalid_typed_data(valid_user_address_context):
 
 
 @pytest.mark.parametrize(
-    "valid_user_address_context", ["EIP712", "SIWE"], indirect=True
+    "valid_user_address_context", Auth.AuthScheme.values(), indirect=True
 )
 def test_user_address_context_variable_verification(
     valid_user_address_context, accounts

tests/fixtures.py

@@ -35,6 +35,7 @@ from nucypher.config.constants import TEMPORARY_DOMAIN_NAME
 from nucypher.crypto.ferveo import dkg
 from nucypher.crypto.keystore import Keystore
 from nucypher.network.nodes import TEACHER_NODES
+from nucypher.policy.conditions.auth import Auth
 from nucypher.policy.conditions.context import USER_ADDRESS_CONTEXT
 from nucypher.policy.conditions.evm import RPCCondition
 from nucypher.policy.conditions.lingo import (
@@ -648,10 +649,11 @@ def rpc_condition():
 
 @pytest.fixture(scope="module")
 def valid_user_address_context(request):
-    if request.param == "EIP712":
+    if request.param == Auth.AuthScheme.EIP712.value:
         auth_message = {
             "signature": "0x488a7acefdc6d098eedf73cdfd379777c0f4a4023a660d350d3bf309a51dd4251abaad9cdd11b71c400cfb4625c14ca142f72b39165bd980c8da1ea32892ff071c",
             "address": "0x5ce9454909639D2D17A3F753ce7d93fa0b9aB12E",
+            "scheme": f"{Auth.AuthScheme.EIP712.value}",
             "typedData": {
                 "primaryType": "Wallet",
                 "types": {
@@ -682,13 +684,16 @@ def valid_user_address_context(request):
                 },
             },
         }
-    else:
+    elif request.param == Auth.AuthScheme.SIWE.value:
         auth_message = {
             "signature": "0x85583ed06e09efd25f0f5b9f948e092f70753182ccd36cfcaa5aa6f7dde6916d7a8fbc367180573f32a6f75410ee99ef202300d991cecac53a6a86baa1c2f1251b",
             "address": "0x638105AA1B69406560f6428aEFACe3DB9da83c64",
-            "scheme": "SIWE",
+            "scheme": f"{Auth.AuthScheme.SIWE.value}",
             "typedData": "localhost:8080 wants you to sign in with your Ethereum account:\n0x638105AA1B69406560f6428aEFACe3DB9da83c64\n\nSign in with Ethereum to the app.\n\nURI: http://localhost:8080\nVersion: 1\nChain ID: 1\nNonce: BIiotOrXWUldCD6Z5\nIssued At: 2023-05-09T22:09:03.350Z",
         }
+    else:
+        raise ValueError(f"No context for provided scheme, {request.param}")
+
     return {USER_ADDRESS_CONTEXT: auth_message}
 
 

tests/unit/conditions/test_auth.py

@@ -14,7 +14,9 @@ def test_auth_scheme():
         _ = Auth.from_scheme(scheme="rando")
 
 
-@pytest.mark.parametrize("valid_user_address_context", ["EIP712"], indirect=True)
+@pytest.mark.parametrize(
+    "valid_user_address_context", [Auth.AuthScheme.EIP712.value], indirect=True
+)
 def test_authenticate_eip712_problematic_values(
     valid_user_address_context, get_random_checksum_address
 ):
@@ -66,7 +68,9 @@ def test_authenticate_eip712_problematic_values(
     EIP712Auth.authenticate(data, signature, address)
 
 
-@pytest.mark.parametrize("valid_user_address_context", ["SIWE"], indirect=True)
+@pytest.mark.parametrize(
+    "valid_user_address_context", [Auth.AuthScheme.SIWE.value], indirect=True
+)
 def test_authenticate_siwe(valid_user_address_context, get_random_checksum_address):
     data = valid_user_address_context[USER_ADDRESS_CONTEXT]["typedData"]
     signature = valid_user_address_context[USER_ADDRESS_CONTEXT]["signature"]