move additional modules out of messaging package

Signed-off-by: Andrew Whitehead <cywolf@gmail.com>

aries_cloudagent/admin/server.py

@@ -12,12 +12,12 @@
 from marshmallow import fields, Schema
 
 from ..config.injection_context import InjectionContext
-from ..messaging.plugin_registry import PluginRegistry
+from ..core.plugin_registry import PluginRegistry
 from ..messaging.responder import BaseResponder
-from ..messaging.task_queue import TaskQueue
 from ..transport.queue.basic import BasicMessageQueue
 from ..transport.outbound.message import OutboundMessage
 from ..utils.stats import Collector
+from ..utils.task_queue import TaskQueue
 from ..version import __version__
 
 from .base_server import BaseAdminServer

aries_cloudagent/admin/tests/test_admin_server.py

@@ -8,8 +8,8 @@
 from ...config.default_context import DefaultContextBuilder
 from ...config.injection_context import InjectionContext
 from ...config.provider import ClassProvider
-from ...messaging.plugin_registry import PluginRegistry
-from ...messaging.protocol_registry import ProtocolRegistry
+from ...core.plugin_registry import PluginRegistry
+from ...core.protocol_registry import ProtocolRegistry
 from ...transport.outbound.message import OutboundMessage
 
 from ..server import AdminServer

aries_cloudagent/config/default_context.py

@@ -6,13 +6,13 @@
 
 from ..cache.base import BaseCache
 from ..cache.basic import BasicCache
+from ..core.plugin_registry import PluginRegistry
+from ..core.protocol_registry import ProtocolRegistry
 from ..ledger.base import BaseLedger
 from ..ledger.provider import LedgerProvider
 from ..issuer.base import BaseIssuer
 from ..holder.base import BaseHolder
 from ..verifier.base import BaseVerifier
-from ..messaging.plugin_registry import PluginRegistry
-from ..messaging.protocol_registry import ProtocolRegistry
 from ..protocols.actionmenu.base_service import BaseMenuService
 from ..protocols.actionmenu.driver_service import DriverMenuService
 from ..protocols.introduction.base_service import BaseIntroductionService

aries_cloudagent/config/tests/test_default_context.py

@@ -1,6 +1,6 @@
 from asynctest import TestCase as AsyncTestCase
 
-from ...messaging.protocol_registry import ProtocolRegistry
+from ...core.protocol_registry import ProtocolRegistry
 from ...storage.base import BaseStorage
 from ...transport.wire_format import BaseWireFormat
 from ...wallet.base import BaseWallet

aries_cloudagent/core/conductor.py

@@ -19,14 +19,14 @@
 from ..config.logging import LoggingConfigurator
 from ..config.wallet import wallet_config
 from ..messaging.responder import BaseResponder
-from ..messaging.task_queue import CompletedTask, TaskQueue
 from ..protocols.connections.manager import ConnectionManager, ConnectionManagerError
 from ..transport.inbound.manager import InboundTransportManager
 from ..transport.inbound.message import InboundMessage
 from ..transport.outbound.base import OutboundDeliveryError
 from ..transport.outbound.manager import OutboundTransportManager
 from ..transport.outbound.message import OutboundMessage
 from ..transport.wire_format import BaseWireFormat
+from ..utils.task_queue import CompletedTask, TaskQueue
 from ..utils.stats import Collector
 
 from .dispatcher import Dispatcher

aries_cloudagent/core/dispatcher.py

@@ -13,19 +13,19 @@
 from aiohttp.web import HTTPException
 
 from ..config.injection_context import InjectionContext
+from ..core.protocol_registry import ProtocolRegistry
 from ..messaging.agent_message import AgentMessage
 from ..messaging.error import MessageParseError
 from ..messaging.models.base import BaseModelError
-from ..messaging.protocol_registry import ProtocolRegistry
 from ..messaging.request_context import RequestContext
 from ..messaging.responder import BaseResponder
-from ..messaging.task_queue import CompletedTask, PendingTask, TaskQueue
 from ..messaging.util import datetime_now
 from ..protocols.connections.manager import ConnectionManager
 from ..protocols.problem_report.message import ProblemReport
 from ..transport.inbound.message import InboundMessage
 from ..transport.outbound.message import OutboundMessage
 from ..utils.stats import Collector
+from ..utils.task_queue import CompletedTask, PendingTask, TaskQueue
 
 LOGGER = logging.getLogger(__name__)
 

aries_cloudagent/messaging/plugin_registry.py → aries_cloudagent/core/plugin_registry.py

@@ -6,9 +6,10 @@
 from typing import Sequence
 
 from ..config.injection_context import InjectionContext
-from ..messaging.protocol_registry import ProtocolRegistry
 from ..utils.classloader import ClassLoader, ModuleLoadError
 
+from .protocol_registry import ProtocolRegistry
+
 LOGGER = logging.getLogger(__name__)
 
 

aries_cloudagent/core/tests/test_conductor.py

@@ -15,7 +15,7 @@
     PublicKeyType,
     Service,
 )
-from ...messaging.protocol_registry import ProtocolRegistry
+from ...core.protocol_registry import ProtocolRegistry
 from ...protocols.connections.manager import ConnectionManager
 from ...storage.base import BaseStorage
 from ...storage.basic import BasicStorage

aries_cloudagent/core/tests/test_dispatcher.py

@@ -3,17 +3,18 @@
 
 from asynctest import TestCase as AsyncTestCase, mock as async_mock
 
-from .. import dispatcher as test_module
 from ...config.injection_context import InjectionContext
 from ...connections.models.connection_record import ConnectionRecord
+from ...core.protocol_registry import ProtocolRegistry
 from ...messaging.agent_message import AgentMessage, AgentMessageSchema
 from ...messaging.error import MessageParseError
-from ...messaging.protocol_registry import ProtocolRegistry
 from ...protocols.problem_report.message import ProblemReport
 from ...transport.inbound.message import InboundMessage
 from ...transport.inbound.receipt import MessageReceipt
 from ...transport.outbound.message import OutboundMessage
 
+from .. import dispatcher as test_module
+
 
 def make_context() -> InjectionContext:
     context = InjectionContext()

aries_cloudagent/messaging/tests/test_protocol_registry.py → aries_cloudagent/core/tests/test_protocol_registry.py

@@ -1,8 +1,8 @@
 from asynctest import TestCase as AsyncTestCase, mock as async_mock
 
 from ...config.injection_context import InjectionContext
+from ...messaging.error import MessageParseError
 
-from ..error import MessageParseError
 from ..protocol_registry import ProtocolRegistry
 
 

aries_cloudagent/protocols/discovery/handlers/query_handler.py

@@ -1,7 +1,7 @@
 """Handler for incoming query messages."""
 
+from ....core.protocol_registry import ProtocolRegistry
 from ....messaging.base_handler import BaseHandler, BaseResponder, RequestContext
-from ....messaging.protocol_registry import ProtocolRegistry
 
 from ..messages.disclose import Disclose
 from ..messages.query import Query

aries_cloudagent/protocols/discovery/handlers/tests/test_query_handler.py

@@ -1,7 +1,7 @@
 import pytest
 
+from .....core.protocol_registry import ProtocolRegistry
 from .....messaging.base_handler import HandlerException
-from .....messaging.protocol_registry import ProtocolRegistry
 from .....messaging.request_context import RequestContext
 from .....messaging.responder import MockResponder
 

aries_cloudagent/protocols/discovery/routes.py

@@ -5,7 +5,7 @@
 
 from marshmallow import fields, Schema
 
-from ...messaging.protocol_registry import ProtocolRegistry
+from ...core.protocol_registry import ProtocolRegistry
 
 
 class QueryResultSchema(Schema):

aries_cloudagent/transport/inbound/manager.py

@@ -7,8 +7,8 @@
 from typing import Callable, Coroutine
 
 from ...config.injection_context import InjectionContext
-from ...messaging.task_queue import CompletedTask, TaskQueue
 from ...utils.classloader import ClassLoader, ModuleLoadError, ClassNotFoundError
+from ...utils.task_queue import CompletedTask, TaskQueue
 
 from ..outbound.message import OutboundMessage
 from ..wire_format import BaseWireFormat

aries_cloudagent/transport/outbound/manager.py

@@ -10,9 +10,9 @@
 
 from ...connections.models.connection_target import ConnectionTarget
 from ...config.injection_context import InjectionContext
-from ...messaging.task_queue import CompletedTask, TaskQueue, task_exc_info
 from ...utils.classloader import ClassLoader, ModuleLoadError, ClassNotFoundError
 from ...utils.stats import Collector
+from ...utils.task_queue import CompletedTask, TaskQueue, task_exc_info
 
 from ..wire_format import BaseWireFormat
 

aries_cloudagent/transport/pack_format.py

@@ -7,8 +7,8 @@
 from ..config.base import InjectorError
 from ..config.injection_context import InjectionContext
 from ..protocols.routing.messages.forward import Forward
-from ..messaging.task_queue import TaskQueue
 from ..messaging.util import time_now
+from ..utils.task_queue import TaskQueue
 from ..wallet.base import BaseWallet
 from ..wallet.error import WalletError