diff --git a/swh/journal/tests/journal_data.py b/swh/journal/tests/journal_data.py --- a/swh/journal/tests/journal_data.py +++ b/swh/journal/tests/journal_data.py @@ -5,11 +5,34 @@ import datetime -from typing import Any, Dict, List +from typing import Any, Dict, List, Type from swh.model.hashutil import MultiHash, hash_to_bytes from swh.journal.serializers import ModelObject -from swh.journal.writer.kafka import OBJECT_TYPES + +from swh.model.model import ( + BaseModel, + Content, + Directory, + Origin, + OriginVisit, + Release, + Revision, + SkippedContent, + Snapshot, +) + + +OBJECT_TYPES: Dict[Type[BaseModel], str] = { + Content: "content", + Directory: "directory", + Origin: "origin", + OriginVisit: "origin_visit", + Release: "release", + Revision: "revision", + SkippedContent: "skipped_content", + Snapshot: "snapshot", +} CONTENTS = [ diff --git a/swh/journal/writer/kafka.py b/swh/journal/writer/kafka.py --- a/swh/journal/writer/kafka.py +++ b/swh/journal/writer/kafka.py @@ -9,18 +9,6 @@ from confluent_kafka import Producer, KafkaException -from swh.model.model import ( - BaseModel, - Content, - Directory, - Origin, - OriginVisit, - Release, - Revision, - SkippedContent, - Snapshot, -) - from swh.journal.serializers import ( KeyType, ModelObject, @@ -32,17 +20,6 @@ logger = logging.getLogger(__name__) -OBJECT_TYPES: Dict[Type[BaseModel], str] = { - Content: "content", - Directory: "directory", - Origin: "origin", - OriginVisit: "origin_visit", - Release: "release", - Revision: "revision", - SkippedContent: "skipped_content", - Snapshot: "snapshot", -} - class DeliveryTag(NamedTuple): """Unique tag allowing us to check for a message delivery"""