From 173143359accde002adb2eb888c1f276795d8c45 Mon Sep 17 00:00:00 2001
From: Vincent Texier <vit@free.fr>
Date: Thu, 1 Jul 2021 19:48:58 +0200
Subject: [PATCH] [enh] #181 move crc_pubkey.py to key package (BBC)

---
 duniterpy/documents/__init__.py            | 3 +--
 duniterpy/documents/block.py               | 3 ++-
 duniterpy/documents/block_uid.py           | 4 ++--
 duniterpy/documents/certification.py       | 3 ++-
 duniterpy/documents/identity.py            | 3 ++-
 duniterpy/documents/membership.py          | 3 ++-
 duniterpy/documents/peer.py                | 2 +-
 duniterpy/documents/transaction.py         | 2 +-
 duniterpy/documents/ws2p/heads.py          | 3 ++-
 duniterpy/{documents => key}/crc_pubkey.py | 4 ++--
 tests/documents/test_crc_pubkey.py         | 2 +-
 11 files changed, 18 insertions(+), 14 deletions(-)
 rename duniterpy/{documents => key}/crc_pubkey.py (96%)

diff --git a/duniterpy/documents/__init__.py b/duniterpy/documents/__init__.py
index b9fe552a..016947d6 100644
--- a/duniterpy/documents/__init__.py
+++ b/duniterpy/documents/__init__.py
@@ -14,9 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from .block import Block
-from .block_uid import BlockUID, block_uid
+from .block_uid import BlockUID
 from .certification import Certification
-from .crc_pubkey import CRCPubkey
 from .document import Document, MalformedDocumentError
 from .identity import Identity
 from .membership import Membership
diff --git a/duniterpy/documents/block.py b/duniterpy/documents/block.py
index d93fa412..4daa98b9 100644
--- a/duniterpy/documents/block.py
+++ b/duniterpy/documents/block.py
@@ -18,11 +18,12 @@ import hashlib
 import re
 from typing import List, Optional, Sequence, Type, TypeVar
 
+from duniterpy.documents.block_uid import BlockUID
+
 from ..constants import BLOCK_HASH_REGEX, G1_CURRENCY_CODENAME, PUBKEY_REGEX
 
 # required to type hint cls in classmethod
 from ..key import SigningKey, VerifyingKey
-from .block_uid import BlockUID
 from .certification import Certification
 from .document import Document, MalformedDocumentError
 from .identity import Identity
diff --git a/duniterpy/documents/block_uid.py b/duniterpy/documents/block_uid.py
index 3707b27f..74d86eb9 100644
--- a/duniterpy/documents/block_uid.py
+++ b/duniterpy/documents/block_uid.py
@@ -16,8 +16,8 @@
 import re
 from typing import Type, TypeVar, Union
 
-from ..constants import BLOCK_HASH_REGEX, BLOCK_ID_REGEX, EMPTY_HASH
-from .document import MalformedDocumentError
+from duniterpy.constants import BLOCK_HASH_REGEX, BLOCK_ID_REGEX, EMPTY_HASH
+from duniterpy.documents.document import MalformedDocumentError
 
 # required to type hint cls in classmethod
 BlockUIDType = TypeVar("BlockUIDType", bound="BlockUID")
diff --git a/duniterpy/documents/certification.py b/duniterpy/documents/certification.py
index b0c93bc5..09b3b865 100644
--- a/duniterpy/documents/certification.py
+++ b/duniterpy/documents/certification.py
@@ -16,6 +16,8 @@
 import re
 from typing import Optional, Type, TypeVar, Union
 
+from duniterpy.documents.block_uid import BlockUID
+
 from ..constants import (
     BLOCK_ID_REGEX,
     BLOCK_UID_REGEX,
@@ -26,7 +28,6 @@ from ..constants import (
 
 # required to type hint cls in classmethod
 from ..key import SigningKey
-from .block_uid import BlockUID
 from .document import Document, MalformedDocumentError
 from .identity import Identity
 
diff --git a/duniterpy/documents/identity.py b/duniterpy/documents/identity.py
index 6cf3007c..79a8f06f 100644
--- a/duniterpy/documents/identity.py
+++ b/duniterpy/documents/identity.py
@@ -16,6 +16,8 @@
 import re
 from typing import Type, TypeVar
 
+from duniterpy.documents.block_uid import BlockUID
+
 from ..constants import (
     BLOCK_UID_REGEX,
     G1_CURRENCY_CODENAME,
@@ -26,7 +28,6 @@ from ..constants import (
 
 # required to type hint cls in classmethod
 from ..key import SigningKey
-from .block_uid import BlockUID
 from .document import Document, MalformedDocumentError
 
 IdentityType = TypeVar("IdentityType", bound="Identity")
diff --git a/duniterpy/documents/membership.py b/duniterpy/documents/membership.py
index 3c966357..411041ed 100644
--- a/duniterpy/documents/membership.py
+++ b/duniterpy/documents/membership.py
@@ -16,6 +16,8 @@
 import re
 from typing import Type, TypeVar
 
+from duniterpy.documents.block_uid import BlockUID
+
 from ..constants import (
     BLOCK_UID_REGEX,
     G1_CURRENCY_CODENAME,
@@ -25,7 +27,6 @@ from ..constants import (
 
 # required to type hint cls in classmethod
 from ..key import SigningKey
-from .block_uid import BlockUID
 from .document import Document, MalformedDocumentError
 
 MembershipType = TypeVar("MembershipType", bound="Membership")
diff --git a/duniterpy/documents/peer.py b/duniterpy/documents/peer.py
index 7df979ab..61339a62 100644
--- a/duniterpy/documents/peer.py
+++ b/duniterpy/documents/peer.py
@@ -17,12 +17,12 @@ import re
 from typing import List, Type, TypeVar
 
 from duniterpy.api.endpoint import Endpoint, endpoint
+from duniterpy.documents.block_uid import BlockUID
 
 from ..constants import BLOCK_HASH_REGEX, G1_CURRENCY_CODENAME, PUBKEY_REGEX
 
 # required to type hint cls in classmethod
 from ..key import SigningKey
-from .block_uid import BlockUID
 from .document import Document, MalformedDocumentError
 
 PeerType = TypeVar("PeerType", bound="Peer")
diff --git a/duniterpy/documents/transaction.py b/duniterpy/documents/transaction.py
index 21e4ba10..00fef068 100644
--- a/duniterpy/documents/transaction.py
+++ b/duniterpy/documents/transaction.py
@@ -19,6 +19,7 @@ from typing import Any, Dict, List, Optional, Tuple, Type, TypeVar, Union
 
 import pypeg2
 
+from duniterpy.documents.block_uid import BlockUID
 from duniterpy.grammars.output import Condition
 
 from ..constants import (
@@ -30,7 +31,6 @@ from ..constants import (
 )
 from ..grammars import output
 from ..key import SigningKey, VerifyingKey
-from .block_uid import BlockUID
 from .document import Document, MalformedDocumentError
 
 VERSION = 10
diff --git a/duniterpy/documents/ws2p/heads.py b/duniterpy/documents/ws2p/heads.py
index c2ec8b58..e7dcc007 100644
--- a/duniterpy/documents/ws2p/heads.py
+++ b/duniterpy/documents/ws2p/heads.py
@@ -16,6 +16,8 @@ import re
 
 import attr
 
+from duniterpy.documents.block_uid import BlockUID
+
 from ...constants import (
     BLOCK_UID_REGEX,
     PUBKEY_REGEX,
@@ -26,7 +28,6 @@ from ...constants import (
     WS2PID_REGEX,
 )
 from ...key import VerifyingKey
-from ..block_uid import BlockUID
 from ..document import MalformedDocumentError
 
 
diff --git a/duniterpy/documents/crc_pubkey.py b/duniterpy/key/crc_pubkey.py
similarity index 96%
rename from duniterpy/documents/crc_pubkey.py
rename to duniterpy/key/crc_pubkey.py
index 0a5b0c50..498e2a15 100644
--- a/duniterpy/documents/crc_pubkey.py
+++ b/duniterpy/key/crc_pubkey.py
@@ -19,8 +19,8 @@ from typing import Type, TypeVar
 
 import base58
 
-from ..constants import PUBKEY_REGEX
-from ..tools import ensure_str
+from duniterpy.constants import PUBKEY_REGEX
+from duniterpy.tools import ensure_str
 
 # required to type hint cls in classmethod
 CRCPubkeyType = TypeVar("CRCPubkeyType", bound="CRCPubkey")
diff --git a/tests/documents/test_crc_pubkey.py b/tests/documents/test_crc_pubkey.py
index 638672f3..b7f54d3a 100644
--- a/tests/documents/test_crc_pubkey.py
+++ b/tests/documents/test_crc_pubkey.py
@@ -15,7 +15,7 @@
 
 import unittest
 
-from duniterpy.documents.crc_pubkey import CRCPubkey
+from duniterpy.key.crc_pubkey import CRCPubkey
 
 
 class TestCRCPubkey(unittest.TestCase):
-- 
GitLab