database: rename module from dbhelper

diffrepro.py

@@ -12,10 +12,10 @@ from typing import (  # noqa
     Union)
 
 from respdiff import cli, sendrecv
-from respdiff.dataformat import Diff, DiffReport, FieldLabel, ReproData, QID  # noqa
-from respdiff.dbhelper import (
+from respdiff.database import (
     DNSReply, DNSRepliesFactory, key2qid, LMDB, MetaDatabase,
     ResolverID, qid2key, QKey, WireFormat)
+from respdiff.dataformat import Diff, DiffReport, FieldLabel, ReproData, QID  # noqa
 from respdiff.match import compare
 from respdiff.query import get_query_iterator
 

diffsum.py

@@ -8,8 +8,8 @@ from typing import (  # noqa
     Union)
 
 from respdiff import cli
+from respdiff.database import LMDB
 from respdiff.dataformat import DiffReport, Summary
-from respdiff.dbhelper import LMDB
 from respdiff.query import (
     convert_queries, get_printable_queries_format, get_query_iterator)
 

histogram.py

@@ -15,7 +15,8 @@ import lmdb
 import numpy as np
 
 from respdiff import cfg, cli
-from respdiff.dbhelper import DNSRepliesFactory, LMDB, MetaDatabase, ResolverID
+from respdiff.database import DNSRepliesFactory, LMDB, MetaDatabase
+from respdiff.typing import ResolverID
 
 # Force matplotlib to use a different backend to handle machines without a display
 import matplotlib

msgdiff.py

@@ -15,8 +15,9 @@ import dns.message
 from respdiff import cli
 from respdiff.dataformat import (
     DiffReport, Disagreements, DisagreementsCounter, FieldLabel, QID)
-from respdiff.dbhelper import DNSRepliesFactory, key2qid, LMDB, MetaDatabase, ResolverID
+from respdiff.database import DNSRepliesFactory, key2qid, LMDB, MetaDatabase
 from respdiff.match import compare
+from respdiff.typing import ResolverID
 
 
 lmdb = None

orchestrator.py

@@ -6,7 +6,7 @@ import multiprocessing.pool as pool
 import sys
 
 from respdiff import cli, sendrecv
-from respdiff.dbhelper import LMDB, MetaDatabase
+from respdiff.database import LMDB, MetaDatabase
 
 
 def main():

qprep.py

@@ -13,7 +13,7 @@ import dns.message
 import dns.rdatatype
 
 from respdiff import blacklist, cli
-from respdiff.dbhelper import LMDB, qid2key
+from respdiff.database import LMDB, qid2key
 
 REPORT_CHUNKS = 10000
 

respdiff/query.py

@@ -4,7 +4,7 @@ from typing import Callable, Iterable, Iterator, Sequence, Tuple
 import dns.message
 import dns.rdatatype
 
-from .dbhelper import LMDB, qid2key
+from .database import LMDB, qid2key
 from .typing import QID, WireFormat
 
 

respdiff/sendrecv.py

@@ -22,7 +22,7 @@ from typing import Any, Dict, List, Mapping, Sequence, Tuple  # noqa: type hints
 import dns.inet
 import dns.message
 
-from .dbhelper import DNSReply, DNSRepliesFactory
+from .database import DNSReply, DNSRepliesFactory
 from .typing import ResolverID, QKey, WireFormat
 
 IP = str

sumcmp.py

@@ -7,8 +7,8 @@ import math
 import sys
 
 from respdiff import cli
+from respdiff.database import LMDB
 from respdiff.dataformat import DiffReport
-from respdiff.dbhelper import LMDB
 from respdiff.query import (
     convert_queries, get_printable_queries_format, get_query_iterator)
 

tests/test_dbhelper.py → tests/test_database.py

 import os
 import pytest
 
-from respdiff.dbhelper import (
+from respdiff.database import (
     DNSReply, DNSRepliesFactory, LMDB, MetaDatabase, BIN_FORMAT_VERSION, qid2key)