Skip to content

Commit 1730ec8

Browse files
ff137ff137
committed
🚚 Move auto-recovery modules to own package
Signed-off-by: ff137 <ff137@proton.me>
1 parent eac8884 commit 1730ec8

12 files changed

Lines changed: 156 additions & 92 deletions

‎acapy_agent/admin/server.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from aiohttp_apispec import setup_aiohttp_apispec, validation_middleware
1414
from uuid_utils import uuid4
1515

16-
from ..anoncreds.revocation_recovery_middleware import revocation_recovery_middleware
16+
from ..anoncreds.revocation.auto_recovery import revocation_recovery_middleware
1717
from ..config.injection_context import InjectionContext
1818
from ..config.logging import context_wallet_id
1919
from ..core.event_bus import Event, EventBus

‎acapy_agent/anoncreds/revocation/auto_recovery/__init__.py‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
from .event_recovery import EventRecoveryManager
2+
from .event_storage import (
3+
EventStorageManager,
4+
generate_correlation_id,
5+
generate_request_id,
6+
serialize_event_payload,
7+
)
8+
from .retry_utils import (
9+
calculate_event_expiry_timestamp,
10+
calculate_exponential_backoff_delay,
11+
is_event_expired,
12+
)
13+
from .revocation_recovery_middleware import revocation_recovery_middleware
14+
15+
__all__ = [
16+
"EventRecoveryManager",
17+
"EventStorageManager",
18+
"generate_request_id",
19+
"generate_correlation_id",
20+
"serialize_event_payload",
21+
"calculate_event_expiry_timestamp",
22+
"calculate_exponential_backoff_delay",
23+
"is_event_expired",
24+
"revocation_recovery_middleware",
25+
]

acapy_agent/anoncreds/event_recovery.py renamed to acapy_agent/anoncreds/revocation/auto_recovery/event_recovery.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
import logging
44
from typing import Dict
55

6-
from ..core.event_bus import EventBus
7-
from ..core.profile import Profile
8-
from ..storage.type import (
6+
from ....core.event_bus import EventBus
7+
from ....core.profile import Profile
8+
from ....storage.type import (
99
RECORD_TYPE_REV_LIST_CREATE_EVENT,
1010
RECORD_TYPE_REV_LIST_STORE_EVENT,
1111
RECORD_TYPE_REV_REG_ACTIVATION_EVENT,
1212
RECORD_TYPE_REV_REG_DEF_CREATE_EVENT,
1313
RECORD_TYPE_REV_REG_DEF_STORE_EVENT,
1414
RECORD_TYPE_REV_REG_FULL_HANDLING_EVENT,
1515
)
16-
from .event_storage import EventStorageManager, deserialize_event_payload
17-
from .events import (
16+
from ...events import (
1817
RevListCreateRequestedEvent,
1918
RevListCreateRequestedPayload,
2019
RevListStoreRequestedEvent,
@@ -28,6 +27,7 @@
2827
RevRegFullDetectedEvent,
2928
RevRegFullDetectedPayload,
3029
)
30+
from .event_storage import EventStorageManager, deserialize_event_payload
3131

3232
LOGGER = logging.getLogger(__name__)
3333

acapy_agent/anoncreds/event_storage.py renamed to acapy_agent/anoncreds/revocation/auto_recovery/event_storage.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
from anoncreds import RevocationRegistryDefinitionPrivate
99
from uuid_utils import uuid4
1010

11-
from ..core.profile import ProfileSession
12-
from ..messaging.models.base import BaseModel
13-
from ..messaging.util import datetime_to_str, epoch_to_str
14-
from ..storage.base import BaseStorage
15-
from ..storage.error import StorageNotFoundError
16-
from ..storage.record import StorageRecord
17-
from ..storage.type import (
11+
from ....core.profile import ProfileSession
12+
from ....messaging.models.base import BaseModel
13+
from ....messaging.util import datetime_to_str, epoch_to_str
14+
from ....storage.base import BaseStorage
15+
from ....storage.error import StorageNotFoundError
16+
from ....storage.record import StorageRecord
17+
from ....storage.type import (
1818
EVENT_STATE_REQUESTED,
1919
EVENT_STATE_RESPONSE_FAILURE,
2020
EVENT_STATE_RESPONSE_SUCCESS,
@@ -25,7 +25,7 @@
2525
RECORD_TYPE_REV_REG_DEF_STORE_EVENT,
2626
RECORD_TYPE_REV_REG_FULL_HANDLING_EVENT,
2727
)
28-
from ..utils.classloader import ClassLoader
28+
from ....utils.classloader import ClassLoader
2929
from .retry_utils import (
3030
calculate_event_expiry_timestamp,
3131
get_retry_metadata_for_storage,

acapy_agent/anoncreds/retry_utils.py renamed to acapy_agent/anoncreds/revocation/auto_recovery/retry_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from datetime import datetime, timedelta, timezone
55
from typing import Dict
66

7-
from ..messaging.util import str_to_datetime
7+
from ....messaging.util import str_to_datetime
88

99
retry_config: Dict[str, int] = {
1010
"min_retry_duration_seconds": int(

acapy_agent/anoncreds/revocation_recovery_middleware.py renamed to acapy_agent/anoncreds/revocation/auto_recovery/revocation_recovery_middleware.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66

77
from aiohttp import web
88

9-
from acapy_agent.core.profile import Profile
10-
11-
from ..admin.request_context import AdminRequestContext
12-
from ..core.event_bus import EventBus
9+
from ....admin.request_context import AdminRequestContext
10+
from ....core.event_bus import EventBus
11+
from ....core.profile import Profile
1312
from .event_recovery import EventRecoveryManager
1413
from .event_storage import EventStorageManager
1514
from .retry_utils import is_event_expired

‎acapy_agent/anoncreds/revocation/revocation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
STATE_FINISHED,
4343
)
4444
from ..error_messages import ANONCREDS_PROFILE_REQUIRED_MSG
45-
from ..event_storage import generate_request_id
4645
from ..events import (
4746
FIRST_REGISTRY_TAG,
4847
RevListCreateRequestedEvent,
@@ -72,6 +71,7 @@
7271
)
7372
from ..registry import AnonCredsRegistry
7473
from ..util import indy_client_dir
74+
from .auto_recovery import generate_request_id
7575

7676
LOGGER = logging.getLogger(__name__)
7777

‎acapy_agent/anoncreds/revocation/revocation_setup.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@
1717
RECORD_TYPE_REV_REG_DEF_STORE_EVENT,
1818
RECORD_TYPE_REV_REG_FULL_HANDLING_EVENT,
1919
)
20-
from ..event_storage import (
21-
EventStorageManager,
22-
generate_correlation_id,
23-
generate_request_id,
24-
serialize_event_payload,
25-
)
2620
from ..events import (
2721
FIRST_REGISTRY_TAG,
2822
INTERVENTION_REQUIRED_EVENT,
@@ -45,11 +39,15 @@
4539
RevRegFullHandlingResponseEvent,
4640
)
4741
from ..issuer import STATE_FINISHED
48-
from ..retry_utils import (
42+
from ..revocation import AnonCredsRevocation
43+
from .auto_recovery import (
44+
EventStorageManager,
4945
calculate_event_expiry_timestamp,
5046
calculate_exponential_backoff_delay,
47+
generate_correlation_id,
48+
generate_request_id,
49+
serialize_event_payload,
5150
)
52-
from ..revocation import AnonCredsRevocation
5351

5452
LOGGER = logging.getLogger(__name__)
5553

0 commit comments

Comments
 (0)