Skip to content

Commit a00b5f5

Browse files
jamshalejamshale
authored
Add anoncreds issuance and presentation format (openwallet-foundation#3331)
* Add anoncreds issuance and presentation formats Signed-off-by: jamshale <[email protected]> * Fix unit tests Signed-off-by: jamshale <[email protected]> * Fix error in _formats_attach Signed-off-by: jamshale <[email protected]> * Fix AnoncredsDID validation pattern Signed-off-by: jamshale <[email protected]> * Fix name Signed-off-by: jamshale <[email protected]> * Fix scenario test Signed-off-by: jamshale <[email protected]> * Update demo with anoncreds format Signed-off-by: jamshale <[email protected]> * Fix the scenario test and add better description Signed-off-by: jamshale <[email protected]> * Add service_healthy check for indy agent Signed-off-by: jamshale <[email protected]> * Fix/update BDD tests Signed-off-by: jamshale <[email protected]> * Add issuer askar to holder anoncreds support Signed-off-by: jamshale <[email protected]> * Update BDD tests Signed-off-by: jamshale <[email protected]> * Remove commented code Signed-off-by: jamshale <[email protected]> * Expand scenario test Signed-off-by: jamshale <[email protected]> * Add better comments for format compatibilty imports Signed-off-by: jamshale <[email protected]> * Add anocnreds compatibilty bdd test to PR workflow Signed-off-by: jamshale <[email protected]> --------- Signed-off-by: jamshale <[email protected]>
1 parent e27598d commit a00b5f5

File tree

96 files changed

+3917
-1049
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+3917
-1049
lines changed

‎acapy_agent/anoncreds/base.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
from ..config.injection_context import InjectionContext
77
from ..core.error import BaseError
88
from ..core.profile import Profile
9-
from .models.anoncreds_cred_def import CredDef, CredDefResult, GetCredDefResult
10-
from .models.anoncreds_revocation import (
9+
from .models.credential_definition import CredDef, CredDefResult, GetCredDefResult
10+
from .models.revocation import (
1111
GetRevListResult,
1212
GetRevRegDefResult,
1313
RevList,
1414
RevListResult,
1515
RevRegDef,
1616
RevRegDefResult,
1717
)
18-
from .models.anoncreds_schema import AnonCredsSchema, GetSchemaResult, SchemaResult
18+
from .models.schema import AnonCredsSchema, GetSchemaResult, SchemaResult
1919

2020
T = TypeVar("T")
2121

‎acapy_agent/anoncreds/default/did_indy/registry.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
from ....config.injection_context import InjectionContext
88
from ....core.profile import Profile
99
from ...base import BaseAnonCredsRegistrar, BaseAnonCredsResolver
10-
from ...models.anoncreds_cred_def import CredDef, CredDefResult, GetCredDefResult
11-
from ...models.anoncreds_revocation import (
10+
from ...models.credential_definition import CredDef, CredDefResult, GetCredDefResult
11+
from ...models.revocation import (
1212
GetRevListResult,
1313
GetRevRegDefResult,
1414
RevList,
1515
RevListResult,
1616
RevRegDef,
1717
RevRegDefResult,
1818
)
19-
from ...models.anoncreds_schema import AnonCredsSchema, GetSchemaResult, SchemaResult
19+
from ...models.schema import AnonCredsSchema, GetSchemaResult, SchemaResult
2020

2121
LOGGER = logging.getLogger(__name__)
2222

‎acapy_agent/anoncreds/default/did_web/registry.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
from ....config.injection_context import InjectionContext
77
from ....core.profile import Profile
88
from ...base import BaseAnonCredsRegistrar, BaseAnonCredsResolver
9-
from ...models.anoncreds_cred_def import CredDef, CredDefResult, GetCredDefResult
10-
from ...models.anoncreds_revocation import (
9+
from ...models.credential_definition import CredDef, CredDefResult, GetCredDefResult
10+
from ...models.revocation import (
1111
GetRevListResult,
1212
GetRevRegDefResult,
1313
RevList,
1414
RevListResult,
1515
RevRegDef,
1616
RevRegDefResult,
1717
)
18-
from ...models.anoncreds_schema import AnonCredsSchema, GetSchemaResult, SchemaResult
18+
from ...models.schema import AnonCredsSchema, GetSchemaResult, SchemaResult
1919

2020

2121
class DIDWebRegistry(BaseAnonCredsResolver, BaseAnonCredsRegistrar):

‎acapy_agent/anoncreds/default/legacy_indy/recover.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import indy_vdr
1010
from anoncreds import RevocationRegistry, RevocationRegistryDefinition
1111

12-
from ...models.anoncreds_revocation import RevList
12+
from ...models.revocation import RevList
1313

1414
LOGGER = logging.getLogger(__name__)
1515

‎acapy_agent/anoncreds/default/legacy_indy/registry.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@
5656
)
5757
from ...events import RevListFinishedEvent
5858
from ...issuer import CATEGORY_CRED_DEF, AnonCredsIssuer, AnonCredsIssuerError
59-
from ...models.anoncreds_cred_def import (
59+
from ...models.credential_definition import (
6060
CredDef,
6161
CredDefResult,
6262
CredDefState,
6363
CredDefValue,
6464
GetCredDefResult,
6565
)
66-
from ...models.anoncreds_revocation import (
66+
from ...models.revocation import (
6767
GetRevListResult,
6868
GetRevRegDefResult,
6969
RevList,
@@ -74,7 +74,7 @@
7474
RevRegDefState,
7575
RevRegDefValue,
7676
)
77-
from ...models.anoncreds_schema import (
77+
from ...models.schema import (
7878
AnonCredsSchema,
7979
GetSchemaResult,
8080
SchemaResult,

‎acapy_agent/anoncreds/default/legacy_indy/tests/test_recover.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
import pytest
1010
from anoncreds import RevocationRegistryDefinition
1111

12-
from acapy_agent.tests import mock
13-
14-
from ....models.anoncreds_revocation import RevList, RevRegDef, RevRegDefValue
12+
from .....tests import mock
13+
from ....models.revocation import RevList, RevRegDef, RevRegDefValue
1514
from ..recover import (
1615
RevocRecoveryException,
1716
_check_tails_hash_for_inconsistency,

‎acapy_agent/anoncreds/default/legacy_indy/tests/test_registry.py‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,6 @@
1616
from .....anoncreds.base import AnonCredsSchemaAlreadyExists
1717
from .....anoncreds.default.legacy_indy import registry as test_module
1818
from .....anoncreds.issuer import AnonCredsIssuer
19-
from .....anoncreds.models.anoncreds_cred_def import (
20-
CredDef,
21-
CredDefResult,
22-
CredDefValue,
23-
CredDefValuePrimary,
24-
)
25-
from .....anoncreds.models.anoncreds_revocation import (
26-
RevList,
27-
RevListResult,
28-
RevRegDef,
29-
RevRegDefResult,
30-
RevRegDefState,
31-
RevRegDefValue,
32-
)
33-
from .....anoncreds.models.anoncreds_schema import (
34-
AnonCredsSchema,
35-
GetSchemaResult,
36-
SchemaResult,
37-
)
3819
from .....askar.profile_anon import (
3920
AskarAnoncredsProfileSession,
4021
)
@@ -55,6 +36,21 @@
5536
)
5637
from .....tests import mock
5738
from .....utils.testing import create_test_profile
39+
from ....models.credential_definition import (
40+
CredDef,
41+
CredDefResult,
42+
CredDefValue,
43+
CredDefValuePrimary,
44+
)
45+
from ....models.revocation import (
46+
RevList,
47+
RevListResult,
48+
RevRegDef,
49+
RevRegDefResult,
50+
RevRegDefState,
51+
RevRegDefValue,
52+
)
53+
from ....models.schema import AnonCredsSchema, GetSchemaResult, SchemaResult
5854

5955
B58 = alphabet if isinstance(alphabet, str) else alphabet.decode("ascii")
6056
INDY_DID = rf"^(did:sov:)?[{B58}]{{21,22}}$"

‎acapy_agent/anoncreds/events.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from typing import NamedTuple, Optional
55

66
from ..core.event_bus import Event
7-
from .models.anoncreds_revocation import RevRegDef
7+
from .models.revocation import RevRegDef
88

99
CRED_DEF_FINISHED_EVENT = "anoncreds::credential-definition::finished"
1010
REV_REG_DEF_FINISHED_EVENT = "anoncreds::revocation-registry-definition::finished"

‎acapy_agent/anoncreds/holder.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
from pyld.jsonld import JsonLdProcessor
2424
from uuid_utils import uuid4
2525

26-
from ..anoncreds.models.anoncreds_schema import AnonCredsSchema
2726
from ..askar.profile_anon import AskarAnoncredsProfile
2827
from ..core.error import BaseError
2928
from ..core.profile import Profile
@@ -33,7 +32,8 @@
3332
from ..vc.vc_ld import VerifiableCredential
3433
from ..wallet.error import WalletNotFoundError
3534
from .error_messages import ANONCREDS_PROFILE_REQUIRED_MSG
36-
from .models.anoncreds_cred_def import CredDef
35+
from .models.credential_definition import CredDef
36+
from .models.schema import AnonCredsSchema
3737
from .registry import AnonCredsRegistry
3838

3939
LOGGER = logging.getLogger(__name__)

‎acapy_agent/anoncreds/issuer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
from .base import AnonCredsSchemaAlreadyExists, BaseAnonCredsError
2525
from .error_messages import ANONCREDS_PROFILE_REQUIRED_MSG
2626
from .events import CredDefFinishedEvent
27-
from .models.anoncreds_cred_def import CredDef, CredDefResult
28-
from .models.anoncreds_schema import AnonCredsSchema, SchemaResult, SchemaState
27+
from .models.credential_definition import CredDef, CredDefResult
28+
from .models.schema import AnonCredsSchema, SchemaResult, SchemaState
2929
from .registry import AnonCredsRegistry
3030

3131
LOGGER = logging.getLogger(__name__)

0 commit comments

Comments
 (0)