Merge pull request #492 from didx-xyz/fix/retry-configuring-endorser

🎨 refactor onboarding and 🐛 fix setting of endorser metadata
didx-xyz · Oct 9, 2023 · 3f87020 · 3f87020
2 parents d5c3af0 + 6df22f1
commit 3f87020
Show file tree

Hide file tree

Showing 15 changed files with 705 additions and 558 deletions.
diff --git a/.gitignore b/.gitignore
@@ -71,6 +71,7 @@ coverage.xml
 .hypothesis/
 .pytest_cache/
 cover/
+junit.xml
 
 # Translations
 *.mo

diff --git a/app/event_handling/sse_listener.py b/app/event_handling/sse_listener.py
@@ -1,4 +1,5 @@
 import json
+from typing import Any, Dict
 
 import httpx
 
@@ -26,7 +27,7 @@ def __init__(
         self.wallet_id = wallet_id
         self.topic = topic
 
-    async def wait_for_state(self, desired_state, timeout: int = 120):
+    async def wait_for_state(self, desired_state, timeout: int = 120) -> Dict[str, Any]:
         """
         Start listening for SSE events. When an event is received that matches the specified parameters.
         """
@@ -46,7 +47,9 @@ async def wait_for_state(self, desired_state, timeout: int = 120):
 
         raise SseListenerTimeout("Event with request state was not returned by server.")
 
-    async def wait_for_event(self, field, field_id, desired_state, timeout: int = 120):
+    async def wait_for_event(
+        self, field, field_id, desired_state, timeout: int = 120
+    ) -> Dict[str, Any]:
         """
         Start listening for SSE events. When an event is received that matches the specified parameters.
         """

diff --git a/app/routes/admin/tenants.py b/app/routes/admin/tenants.py
@@ -25,7 +25,7 @@
     UpdateTenantRequest,
     WalletListWithGroups,
 )
-from app.services.onboarding import handle_tenant_update, onboard_tenant
+from app.services.onboarding.tenants import handle_tenant_update, onboard_tenant
 from app.services.trust_registry import (
     Actor,
     TrustRegistryException,