diff --git a/aries_cloudagent/ledger/base.py b/aries_cloudagent/ledger/base.py index c8a6422d7a..16ff8c5175 100644 --- a/aries_cloudagent/ledger/base.py +++ b/aries_cloudagent/ledger/base.py @@ -1,6 +1,7 @@ """Ledger base class.""" import re +import json from abc import ABC, abstractmethod, ABCMeta from enum import Enum diff --git a/aries_cloudagent/wallet/routes.py b/aries_cloudagent/wallet/routes.py index 0d5b982ea4..e0ebe1b06e 100644 --- a/aries_cloudagent/wallet/routes.py +++ b/aries_cloudagent/wallet/routes.py @@ -18,6 +18,7 @@ from ..core.event_bus import Event, EventBus from ..core.profile import Profile from ..connections.models.conn_record import ConnRecord +from ..connections.util import mediation_record_if_id from ..ledger.base import BaseLedger from ..ledger.endpoint_type import EndpointType from ..ledger.error import LedgerConfigError, LedgerError @@ -451,8 +452,7 @@ async def wallet_set_public_did(request: web.BaseRequest): mediation_id = request.query.get("mediation_id") profile = context.profile - route_manager = profile.inject(RouteManager) - mediation_record = await route_manager.mediation_record_if_id( + mediation_record = await mediation_record_if_id( profile=profile, mediation_id=mediation_id, or_default=True ) routing_keys = None diff --git a/aries_cloudagent/wallet/tests/test_routes.py b/aries_cloudagent/wallet/tests/test_routes.py index ecc7df1166..5d64227a8d 100644 --- a/aries_cloudagent/wallet/tests/test_routes.py +++ b/aries_cloudagent/wallet/tests/test_routes.py @@ -381,14 +381,6 @@ async def test_set_public_did(self): ledger.__aenter__ = async_mock.CoroutineMock(return_value=ledger) self.profile.context.injector.bind_instance(BaseLedger, ledger) - mock_route_manager = async_mock.MagicMock() - mock_route_manager.route_public_did = async_mock.AsyncMock() - mock_route_manager.mediation_record_if_id = async_mock.AsyncMock() - mock_route_manager.__aenter__ = async_mock.AsyncMock( - return_value=mock_route_manager - ) - self.profile.context.injector.bind_instance(RouteManager, mock_route_manager) - with async_mock.patch.object( test_module.web, "json_response", async_mock.Mock() ) as json_response: @@ -454,12 +446,6 @@ async def test_set_public_did_no_query_did(self): async def test_set_public_did_no_ledger(self): - mock_route_manager = async_mock.MagicMock() - mock_route_manager.mediation_record_if_id = async_mock.AsyncMock() - mock_route_manager.__aenter__ = async_mock.AsyncMock( - return_value=mock_route_manager - ) - self.profile.context.injector.bind_instance(RouteManager, mock_route_manager) self.request.query = {"did": self.test_did} with self.assertRaises(test_module.web.HTTPForbidden): @@ -474,13 +460,6 @@ async def test_set_public_did_not_public(self): ledger.__aenter__ = async_mock.CoroutineMock(return_value=ledger) self.profile.context.injector.bind_instance(BaseLedger, ledger) - mock_route_manager = async_mock.MagicMock() - mock_route_manager.mediation_record_if_id = async_mock.AsyncMock() - mock_route_manager.__aenter__ = async_mock.AsyncMock( - return_value=mock_route_manager - ) - self.profile.context.injector.bind_instance(RouteManager, mock_route_manager) - with self.assertRaises(test_module.web.HTTPNotFound): await test_module.wallet_set_public_did(self.request) @@ -493,13 +472,6 @@ async def test_set_public_did_not_found(self): ledger.__aenter__ = async_mock.CoroutineMock(return_value=ledger) self.profile.context.injector.bind_instance(BaseLedger, ledger) - mock_route_manager = async_mock.MagicMock() - mock_route_manager.mediation_record_if_id = async_mock.AsyncMock() - mock_route_manager.__aenter__ = async_mock.AsyncMock( - return_value=mock_route_manager - ) - self.profile.context.injector.bind_instance(RouteManager, mock_route_manager) - self.wallet.get_local_did.side_effect = test_module.WalletNotFoundError() with self.assertRaises(test_module.web.HTTPNotFound): await test_module.wallet_set_public_did(self.request) @@ -514,13 +486,6 @@ async def test_set_public_did_x(self): ledger.__aenter__ = async_mock.CoroutineMock(return_value=ledger) self.profile.context.injector.bind_instance(BaseLedger, ledger) - mock_route_manager = async_mock.MagicMock() - mock_route_manager.mediation_record_if_id = async_mock.AsyncMock() - mock_route_manager.__aenter__ = async_mock.AsyncMock( - return_value=mock_route_manager - ) - self.profile.context.injector.bind_instance(RouteManager, mock_route_manager) - with async_mock.patch.object( test_module.web, "json_response", async_mock.Mock() ) as json_response: @@ -545,13 +510,6 @@ async def test_set_public_did_no_wallet_did(self): ledger.__aenter__ = async_mock.CoroutineMock(return_value=ledger) self.profile.context.injector.bind_instance(BaseLedger, ledger) - mock_route_manager = async_mock.MagicMock() - mock_route_manager.mediation_record_if_id = async_mock.AsyncMock() - mock_route_manager.__aenter__ = async_mock.AsyncMock( - return_value=mock_route_manager - ) - self.profile.context.injector.bind_instance(RouteManager, mock_route_manager) - with async_mock.patch.object( test_module.web, "json_response", async_mock.Mock() ) as json_response: @@ -576,14 +534,6 @@ async def test_set_public_did_update_endpoint(self): ledger.__aenter__ = async_mock.CoroutineMock(return_value=ledger) self.profile.context.injector.bind_instance(BaseLedger, ledger) - mock_route_manager = async_mock.MagicMock() - mock_route_manager.route_public_did = async_mock.AsyncMock() - mock_route_manager.mediation_record_if_id = async_mock.AsyncMock() - mock_route_manager.__aenter__ = async_mock.AsyncMock( - return_value=mock_route_manager - ) - self.profile.context.injector.bind_instance(RouteManager, mock_route_manager) - with async_mock.patch.object( test_module.web, "json_response", async_mock.Mock() ) as json_response: @@ -622,17 +572,6 @@ async def test_set_public_did_update_endpoint_use_default_update_in_wallet(self) ledger.__aenter__ = async_mock.CoroutineMock(return_value=ledger) self.profile.context.injector.bind_instance(BaseLedger, ledger) - - mock_route_manager = async_mock.MagicMock() - mock_route_manager.route_public_did = async_mock.AsyncMock() - mock_route_manager.mediation_record_if_id = async_mock.AsyncMock( - return_value=None - ) - mock_route_manager.__aenter__ = async_mock.AsyncMock( - return_value=mock_route_manager - ) - self.profile.context.injector.bind_instance(RouteManager, mock_route_manager) - with async_mock.patch.object( test_module.web, "json_response", async_mock.Mock() ) as json_response: