fixing import paths

tests/contrib/test_persistence.py

@@ -10,9 +10,8 @@ from sqlalchemy import select
 
 from amqtt.broker import Broker, BrokerContext, RetainedApplicationMessage
 from amqtt.client import MQTTClient
-from amqtt.mqtt.constants import QOS_0, QOS_1
-from amqtt.plugins.persistence import SessionDBPlugin, Subscription, StoredSession, RetainedMessage, \
-    StoredMessage
+from amqtt.mqtt.constants import QOS_1
+from amqtt.contrib.persistence import SessionDBPlugin, Subscription, StoredSession, RetainedMessage
 from amqtt.session import Session
 
 formatter = "[%(asctime)s] %(name)s {%(filename)s:%(lineno)d} %(levelname)s - %(message)s"
@@ -396,7 +395,7 @@ def db_config(db_file):
         },
         'plugins': {
             'amqtt.plugins.authentication.AnonymousAuthPlugin': {'allow_anonymous': False},
-            'amqtt.plugins.persistence.SessionDBPlugin': {
+            'amqtt.contrib.SessionDBPlugin': {
                 'file': db_file,
                 'clear_on_shutdown': False
 

tests/plugins/test_plugins.py

@@ -2,12 +2,10 @@ import asyncio
 import inspect
 import logging
 from functools import partial
-from importlib.metadata import EntryPoint
 from logging import getLogger
 from pathlib import Path
 from types import ModuleType
 from typing import Any, Callable, Coroutine
-from unittest.mock import patch
 
 import pytest
 
@@ -16,10 +14,10 @@ from amqtt.broker import Broker, BrokerContext
 from amqtt.client import MQTTClient
 from amqtt.errors import PluginInitError, PluginImportError
 from amqtt.events import MQTTEvents, BrokerEvents
-from amqtt.mqtt.constants import QOS_0, QOS_2, QOS_1
+from amqtt.mqtt.constants import QOS_0, QOS_1
 from amqtt.plugins.base import BasePlugin
 from amqtt.contexts import BaseContext
-from amqtt.plugins.persistence import RetainedMessage
+from amqtt.contrib.persistence import RetainedMessage
 
 _INVALID_METHOD: str = "invalid_foo"
 _PLUGIN: str = "Plugin"