rename files to avoid ambiguity in docs

Signed-off-by: Andrew Whitehead <[email protected]>

aries_cloudagent/vc/ld_proofs/__init__.py

@@ -1,5 +1,5 @@
 from .ld_proofs import sign, verify, derive
-from .ProofSet import ProofSet
+from .proof_set import ProofSet
 from .purposes import (
     ProofPurpose,
     ControllerProofPurpose,

aries_cloudagent/vc/ld_proofs/crypto/__init__.py

@@ -1,4 +1,4 @@
-from .KeyPair import KeyPair
-from .WalletKeyPair import WalletKeyPair
+from .key_pair import KeyPair
+from .wallet_key_pair import WalletKeyPair
 
 __all__ = ["KeyPair", "WalletKeyPair"]

aries_cloudagent/vc/ld_proofs/crypto/tests/test_WalletKeyPair.py → aries_cloudagent/vc/ld_proofs/crypto/tests/test_wallet_key_pair.py

@@ -1,9 +1,10 @@
-from asynctest import TestCase
-from asynctest import mock as async_mock
+from asynctest import TestCase, mock as async_mock
 
 from .....wallet.key_pair import KeyType
+
 from ...error import LinkedDataProofException
-from ..WalletKeyPair import WalletKeyPair
+
+from ..wallet_key_pair import WalletKeyPair
 
 
 class TestWalletKeyPair(TestCase):

aries_cloudagent/vc/ld_proofs/crypto/WalletKeyPair.py → aries_cloudagent/vc/ld_proofs/crypto/wallet_key_pair.py

@@ -5,8 +5,10 @@
 from ....wallet.util import b58_to_bytes
 from ....wallet.key_type import KeyType
 from ....wallet.base import BaseWallet
+
 from ..error import LinkedDataProofException
-from .KeyPair import KeyPair
+
+from .key_pair import KeyPair
 
 
 class WalletKeyPair(KeyPair):

aries_cloudagent/vc/ld_proofs/ld_proofs.py

@@ -2,11 +2,11 @@
 
 from typing import List
 
-from .validation_result import DocumentVerificationResult
 from .document_loader import DocumentLoaderMethod
-from .ProofSet import ProofSet
+from .proof_set import ProofSet
 from .purposes import ProofPurpose
 from .suites import LinkedDataProof
+from .validation_result import DocumentVerificationResult
 
 
 async def sign(

aries_cloudagent/vc/ld_proofs/ProofSet.py → aries_cloudagent/vc/ld_proofs/proof_set.py

@@ -1,14 +1,15 @@
 """Class to represent a Linked Data proof set."""
 
 from typing import List, Union
+
 from pyld.jsonld import JsonLdProcessor
 
-from .error import LinkedDataProofException
-from .validation_result import DocumentVerificationResult, ProofResult
 from .constants import SECURITY_CONTEXT_URL
 from .document_loader import DocumentLoaderMethod
-from .purposes.ProofPurpose import ProofPurpose
+from .error import LinkedDataProofException
+from .purposes.proof_purpose import ProofPurpose
 from .suites import LinkedDataProof
+from .validation_result import DocumentVerificationResult, ProofResult
 
 
 class ProofSet:

aries_cloudagent/vc/ld_proofs/purposes/__init__.py

@@ -1,8 +1,9 @@
-from .ProofPurpose import ProofPurpose
-from .ControllerProofPurpose import ControllerProofPurpose
-from .AssertionProofPurpose import AssertionProofPurpose
-from .AuthenticationProofPurpose import AuthenticationProofPurpose
-from .CredentialIssuancePurpose import CredentialIssuancePurpose
+from .proof_purpose import ProofPurpose
+
+from .assertion_proof_purpose import AssertionProofPurpose
+from .authentication_proof_purpose import AuthenticationProofPurpose
+from .controller_proof_purpose import ControllerProofPurpose
+from .credential_issuance_purpose import CredentialIssuancePurpose
 
 __all__ = [
     "ProofPurpose",

aries_cloudagent/vc/ld_proofs/purposes/AssertionProofPurpose.py → aries_cloudagent/vc/ld_proofs/purposes/assertion_proof_purpose.py

@@ -2,7 +2,7 @@
 
 from datetime import datetime, timedelta
 
-from .ControllerProofPurpose import ControllerProofPurpose
+from .controller_proof_purpose import ControllerProofPurpose
 
 
 class AssertionProofPurpose(ControllerProofPurpose):

aries_cloudagent/vc/ld_proofs/purposes/AuthenticationProofPurpose.py → aries_cloudagent/vc/ld_proofs/purposes/authentication_proof_purpose.py

@@ -1,12 +1,17 @@
 """Authentication proof purpose class."""
 
 from datetime import datetime, timedelta
+from typing import TYPE_CHECKING
 
+from ..document_loader import DocumentLoaderMethod
 from ..error import LinkedDataProofException
 from ..validation_result import PurposeResult
-from ..document_loader import DocumentLoaderMethod
-from ..suites import LinkedDataProof
-from .ControllerProofPurpose import ControllerProofPurpose
+
+from .controller_proof_purpose import ControllerProofPurpose
+
+# Avoid circular dependency
+if TYPE_CHECKING:
+    from ..suites import LinkedDataProof
 
 
 class AuthenticationProofPurpose(ControllerProofPurpose):
@@ -37,7 +42,7 @@ def validate(
         *,
         proof: dict,
         document: dict,
-        suite: LinkedDataProof,
+        suite: "LinkedDataProof",
         verification_method: dict,
         document_loader: DocumentLoaderMethod,
     ) -> PurposeResult:

aries_cloudagent/vc/ld_proofs/purposes/ControllerProofPurpose.py → aries_cloudagent/vc/ld_proofs/purposes/controller_proof_purpose.py

@@ -1,14 +1,20 @@
 """Controller proof purpose class."""
 
+from typing import TYPE_CHECKING
+
 from pyld.jsonld import JsonLdProcessor
 from pyld import jsonld
 
-from ..error import LinkedDataProofException
-from ..validation_result import PurposeResult
 from ..constants import SECURITY_CONTEXT_URL
-from ..suites import LinkedDataProof
 from ..document_loader import DocumentLoaderMethod
-from .ProofPurpose import ProofPurpose
+from ..error import LinkedDataProofException
+from ..validation_result import PurposeResult
+
+from .proof_purpose import ProofPurpose
+
+# Avoid circular dependency
+if TYPE_CHECKING:
+    from ..suites import LinkedDataProof
 
 
 class ControllerProofPurpose(ProofPurpose):
@@ -19,7 +25,7 @@ def validate(
         *,
         proof: dict,
         document: dict,
-        suite: LinkedDataProof,
+        suite: "LinkedDataProof",
         verification_method: dict,
         document_loader: DocumentLoaderMethod,
     ) -> PurposeResult:

aries_cloudagent/vc/ld_proofs/purposes/CredentialIssuancePurpose.py → aries_cloudagent/vc/ld_proofs/purposes/credential_issuance_purpose.py

@@ -1,15 +1,20 @@
 """Credential Issuance proof purpose class."""
 
-from typing import List
+from typing import List, TYPE_CHECKING
+
 from pyld.jsonld import JsonLdProcessor
 from pyld import jsonld
 
+from ..constants import CREDENTIALS_ISSUER_URL
+from ..document_loader import DocumentLoaderMethod
 from ..error import LinkedDataProofException
 from ..validation_result import PurposeResult
-from ..suites import LinkedDataProof
-from ..document_loader import DocumentLoaderMethod
-from ..constants import CREDENTIALS_ISSUER_URL
-from .AssertionProofPurpose import AssertionProofPurpose
+
+from .assertion_proof_purpose import AssertionProofPurpose
+
+# Avoid circular dependency
+if TYPE_CHECKING:
+    from ..suites import LinkedDataProof
 
 
 class CredentialIssuancePurpose(AssertionProofPurpose):
@@ -20,7 +25,7 @@ def validate(
         *,
         proof: dict,
         document: dict,
-        suite: LinkedDataProof,
+        suite: "LinkedDataProof",
         verification_method: dict,
         document_loader: DocumentLoaderMethod,
     ) -> PurposeResult:

aries_cloudagent/vc/ld_proofs/purposes/ProofPurpose.py → aries_cloudagent/vc/ld_proofs/purposes/proof_purpose.py

@@ -1,11 +1,16 @@
 """Base Proof Purpose class."""
 
 from datetime import datetime, timedelta
+from typing import TYPE_CHECKING
 
 from ....messaging.util import str_to_datetime
-from ..validation_result import PurposeResult
+
 from ..document_loader import DocumentLoaderMethod
-from ..suites import LinkedDataProof
+from ..validation_result import PurposeResult
+
+# Avoid circular dependency
+if TYPE_CHECKING:
+    from ..suites import LinkedDataProof
 
 
 class ProofPurpose:
@@ -24,7 +29,7 @@ def validate(
         *,
         proof: dict,
         document: dict,
-        suite: LinkedDataProof,
+        suite: "LinkedDataProof",
         verification_method: dict,
         document_loader: DocumentLoaderMethod,
     ) -> PurposeResult:

aries_cloudagent/vc/ld_proofs/purposes/tests/test_AuthenticationProofPurpose.py → aries_cloudagent/vc/ld_proofs/purposes/tests/test_authentication_proof_purpose.py

@@ -2,8 +2,8 @@
 from asynctest import TestCase, mock as async_mock
 
 from ...validation_result import PurposeResult
-from ..ControllerProofPurpose import ControllerProofPurpose
-from ..AuthenticationProofPurpose import AuthenticationProofPurpose
+from ..controller_proof_purpose import ControllerProofPurpose
+from ..authentication_proof_purpose import AuthenticationProofPurpose
 
 
 class TestAuthenticationProofPurpose(TestCase):

aries_cloudagent/vc/ld_proofs/purposes/tests/test_ControllerProofPurpose.py → aries_cloudagent/vc/ld_proofs/purposes/tests/test_controller_proof_purpose.py

@@ -3,8 +3,8 @@
 
 from ....tests.data import TEST_VC_DOCUMENT_SIGNED_DID_KEY_ED25519
 from ....tests.document_loader import custom_document_loader
-from ..ProofPurpose import ProofPurpose
-from ..ControllerProofPurpose import ControllerProofPurpose
+from ..proof_purpose import ProofPurpose
+from ..controller_proof_purpose import ControllerProofPurpose
 
 
 class TestControllerProofPurpose(TestCase):

aries_cloudagent/vc/ld_proofs/purposes/tests/test_CredentialIssuancePurpose.py → aries_cloudagent/vc/ld_proofs/purposes/tests/test_credential_issuance_purpose.py

@@ -2,8 +2,8 @@
 from asynctest import TestCase, mock as async_mock
 
 from ...validation_result import PurposeResult
-from ..AssertionProofPurpose import AssertionProofPurpose
-from ..CredentialIssuancePurpose import CredentialIssuancePurpose
+from ..assertion_proof_purpose import AssertionProofPurpose
+from ..credential_issuance_purpose import CredentialIssuancePurpose
 from ....tests.data import TEST_VC_DOCUMENT_SIGNED_ED25519
 from ....tests.document_loader import custom_document_loader
 

aries_cloudagent/vc/ld_proofs/purposes/tests/test_ProofPurpose.py → aries_cloudagent/vc/ld_proofs/purposes/tests/test_proof_purpose.py

@@ -2,7 +2,7 @@
 from asynctest import TestCase, mock as async_mock
 
 from .....messaging.util import datetime_to_str
-from ..ProofPurpose import ProofPurpose
+from ..proof_purpose import ProofPurpose
 
 
 class TestProofPurpose(TestCase):

aries_cloudagent/vc/ld_proofs/suites/__init__.py

@@ -1,9 +1,9 @@
-from .LinkedDataProof import LinkedDataProof
-from .LinkedDataSignature import LinkedDataSignature
-from .JwsLinkedDataSignature import JwsLinkedDataSignature
-from .Ed25519Signature2018 import Ed25519Signature2018
-from .BbsBlsSignature2020 import BbsBlsSignature2020
-from .BbsBlsSignatureProof2020 import BbsBlsSignatureProof2020
+from .linked_data_proof import LinkedDataProof
+from .linked_data_signature import LinkedDataSignature
+from .jws_linked_data_signature import JwsLinkedDataSignature
+from .ed25519_signature_2018 import Ed25519Signature2018
+from .bbs_bls_signature_2020 import BbsBlsSignature2020
+from .bbs_bls_signature_proof_2020 import BbsBlsSignatureProof2020
 
 __all__ = [
     "LinkedDataProof",

aries_cloudagent/vc/ld_proofs/suites/BbsBlsSignature2020.py → aries_cloudagent/vc/ld_proofs/suites/bbs_bls_signature_2020.py

@@ -3,14 +3,15 @@
 from datetime import datetime
 from typing import List, Union
 
-
 from ....wallet.util import b64_to_bytes, bytes_to_b64
+
 from ..crypto import KeyPair
-from ..error import LinkedDataProofException
-from ..validation_result import ProofResult
 from ..document_loader import DocumentLoaderMethod
+from ..error import LinkedDataProofException
 from ..purposes import ProofPurpose
-from .BbsBlsSignature2020Base import BbsBlsSignature2020Base
+from ..validation_result import ProofResult
+
+from .bbs_bls_signature_2020_base import BbsBlsSignature2020Base
 
 
 class BbsBlsSignature2020(BbsBlsSignature2020Base):

aries_cloudagent/vc/ld_proofs/suites/BbsBlsSignature2020Base.py → aries_cloudagent/vc/ld_proofs/suites/bbs_bls_signature_2020_base.py

@@ -1,13 +1,16 @@
 """BbsBlsSignature2020Base class."""
 
 from abc import ABCMeta, abstractmethod
-from pyld import jsonld
 from typing import List
 
-from ..error import LinkedDataProofException
+from pyld import jsonld
+
 from ....utils.dependencies import is_ursa_bbs_signatures_module_installed
+
 from ..document_loader import DocumentLoaderMethod
-from .LinkedDataProof import LinkedDataProof
+from ..error import LinkedDataProofException
+
+from .linked_data_proof import LinkedDataProof
 
 
 class BbsBlsSignature2020Base(LinkedDataProof, metaclass=ABCMeta):

aries_cloudagent/vc/ld_proofs/suites/BbsBlsSignatureProof2020.py → aries_cloudagent/vc/ld_proofs/suites/bbs_bls_signature_proof_2020.py

@@ -3,9 +3,11 @@
 import re
 
 from os import urandom
-from pyld import jsonld
 from typing import List
-from .BbsBlsSignature2020Base import BbsBlsSignature2020Base
+
+from pyld import jsonld
+
+from .bbs_bls_signature_2020_base import BbsBlsSignature2020Base
 
 if BbsBlsSignature2020Base.BBS_SUPPORTED:
     from ursa_bbs_signatures import (
@@ -21,13 +23,15 @@
 
 from ....utils.dependencies import assert_ursa_bbs_signatures_installed
 from ....wallet.util import b64_to_bytes, bytes_to_b64
+
 from ..crypto import KeyPair
 from ..error import LinkedDataProofException
 from ..validation_result import ProofResult
 from ..document_loader import DocumentLoaderMethod
 from ..purposes import ProofPurpose
-from .BbsBlsSignature2020 import BbsBlsSignature2020
-from .LinkedDataProof import DeriveProofResult
+
+from .bbs_bls_signature_2020 import BbsBlsSignature2020
+from .linked_data_proof import DeriveProofResult
 
 
 class BbsBlsSignatureProof2020(BbsBlsSignature2020Base):

aries_cloudagent/vc/ld_proofs/suites/Ed25519Signature2018.py → aries_cloudagent/vc/ld_proofs/suites/ed25519_signature_2018.py

@@ -4,7 +4,8 @@
 from typing import Union
 
 from ..crypto import KeyPair
-from .JwsLinkedDataSignature import JwsLinkedDataSignature
+
+from .jws_linked_data_signature import JwsLinkedDataSignature
 
 
 class Ed25519Signature2018(JwsLinkedDataSignature):

aries_cloudagent/vc/ld_proofs/suites/JwsLinkedDataSignature.py → aries_cloudagent/vc/ld_proofs/suites/jws_linked_data_signature.py

@@ -1,15 +1,19 @@
 """JWS Linked Data class."""
 
-from pyld.jsonld import JsonLdProcessor
+import json
+
 from datetime import datetime
 from typing import Union
-import json
+
+from pyld.jsonld import JsonLdProcessor
 
 from ....wallet.util import b64_to_bytes, bytes_to_b64, str_to_b64, b64_to_str
+
 from ..crypto import KeyPair
 from ..document_loader import DocumentLoaderMethod
 from ..error import LinkedDataProofException
-from .LinkedDataSignature import LinkedDataSignature
+
+from .linked_data_signature import LinkedDataSignature
 
 
 class JwsLinkedDataSignature(LinkedDataSignature):