[enh] #175 rename timestamp and blockstamp attributes/arguments depending on the type (BBC)

timestamp is used for integer time in seconds block_uid is used for blockUID instances

close #175 (closed)

duniterpy/documents/ws2p/heads.py

@@ -17,7 +17,7 @@ import re
 import attr
 
 from ...constants import (
-    BLOCK_UID_REGEX,
+    BLOCK_ID_REGEX,
     PUBKEY_REGEX,
     SIGNATURE_REGEX,
     WS2P_HEAD_REGEX,
@@ -26,7 +26,7 @@ from ...constants import (
     WS2PID_REGEX,
 )
 from ...key import VerifyingKey
-from ..block_uid import BlockUID
+from ..block_id import BlockID
 from ..document import MalformedDocumentError
 
 
@@ -82,15 +82,15 @@ class HeadV0(Head):
     api = attr.ib(type=API)
     head = attr.ib(type=Head)
     pubkey = attr.ib(type=str)
-    blockstamp = attr.ib(type=BlockUID)
+    block_id = attr.ib(type=BlockID)
 
     re_inline = re.compile(
-        "^(WS2P(?:{ws2p_private})?(?:{ws2p_public})?):({head}):({pubkey}):({blockstamp})(?::)?(.*)".format(
+        "^(WS2P(?:{ws2p_private})?(?:{ws2p_public})?):({head}):({pubkey}):({block_id})(?::)?(.*)".format(
             ws2p_private=WS2P_PRIVATE_PREFIX_REGEX,
             ws2p_public=WS2P_PUBLIC_PREFIX_REGEX,
             head=WS2P_HEAD_REGEX,
             pubkey=PUBKEY_REGEX,
-            blockstamp=BLOCK_UID_REGEX,
+            block_id=BLOCK_ID_REGEX,
         )
     )
 
@@ -105,9 +105,9 @@ class HeadV0(Head):
             api = API.from_inline(data.group(1))
             head = Head.from_inline(data.group(2), "")
             pubkey = data.group(3)
-            blockstamp = BlockUID.from_str(data.group(4))
+            block_id = BlockID.from_str(data.group(4))
             offload = data.group(5)
-            return cls(head.version, signature, api, head, pubkey, blockstamp), offload
+            return cls(head.version, signature, api, head, pubkey, block_id), offload
         except AttributeError:
             raise MalformedDocumentError("HeadV0") from AttributeError
 
@@ -173,7 +173,7 @@ class HeadV1(HeadV0):
                     v0.api,
                     v0.head,
                     v0.pubkey,
-                    v0.blockstamp,
+                    v0.block_id,
                     ws2pid,
                     software,
                     software_version,
@@ -212,7 +212,7 @@ class HeadV2(HeadV1):
                     v1.api,
                     v1.head,
                     v1.pubkey,
-                    v1.blockstamp,
+                    v1.block_id,
                     v1.ws2pid,
                     v1.software,
                     v1.software_version,