diff --git a/duniterpy/documents/block.py b/duniterpy/documents/block.py index 4cd298b8761bfdec38d61a52a8ab820b69a79742..7cf69ef45cd02fd4efd5616250a83406876e7a3a 100644 --- a/duniterpy/documents/block.py +++ b/duniterpy/documents/block.py @@ -98,7 +98,7 @@ The class Block handles Block documents. re_hash = re.compile( "InnerHash: ({block_hash_regex})\n".format(block_hash_regex=BLOCK_HASH_REGEX) ) - re_noonce = re.compile("Nonce: ([0-9]+)\n") + re_nonce = re.compile("Nonce: ([0-9]+)\n") fields_parsers = { **Document.fields_parsers, @@ -127,7 +127,7 @@ The class Block handles Block documents. "Certifications": re_certifications, "Transactions": re_transactions, "InnerHash": re_hash, - "Noonce": re_noonce, + "Nonce": re_nonce, }, } @@ -158,7 +158,7 @@ The class Block handles Block documents. certifications: List[Certification], transactions: List[Transaction], inner_hash: str, - noonce: int, + nonce: int, signature: str, ) -> None: """ @@ -188,8 +188,8 @@ The class Block handles Block documents. :param excluded: members excluded because of missing certifications :param certifications: certifications documents :param transactions: transactions documents - :param inner_hash: the block hah - :param noonce: the noonce value of the block + :param inner_hash: the block hash + :param nonce: the nonce value of the block :param signature: the block signature """ super().__init__(version, currency, [signature]) @@ -229,7 +229,7 @@ The class Block handles Block documents. self.certifications = certifications self.transactions = transactions self.inner_hash = inner_hash - self.noonce = noonce + self.nonce = nonce @property def blockUID(self) -> BlockUID: @@ -399,7 +399,7 @@ The class Block handles Block documents. inner_hash = Block.parse_field("InnerHash", lines[n]) n += 1 - noonce = int(Block.parse_field("Noonce", lines[n])) + nonce = int(Block.parse_field("Nonce", lines[n])) n += 1 signature = Block.parse_field("Signature", lines[n]) @@ -430,7 +430,7 @@ The class Block handles Block documents. certifications, transactions, inner_hash, - noonce, + nonce, signature, ) @@ -509,7 +509,7 @@ PreviousIssuer: {1}\n".format( doc += "InnerHash: {0}\n".format(self.inner_hash) - doc += "Nonce: {0}\n".format(self.noonce) + doc += "Nonce: {0}\n".format(self.nonce) return doc @@ -518,7 +518,7 @@ PreviousIssuer: {1}\n".format( Nonce: {nonce} {signature} """.format( - inner_hash=self.inner_hash, nonce=self.noonce, signature=self.signatures[0] + inner_hash=self.inner_hash, nonce=self.nonce, signature=self.signatures[0] ) return hashlib.sha256(doc_str.encode("ascii")).hexdigest().upper() diff --git a/tests/documents/test_block.py b/tests/documents/test_block.py index 1b534620352ccba29d124673e7533e21f09e6639..bee6411df102791f694660f19ed6ff33366f7198 100644 --- a/tests/documents/test_block.py +++ b/tests/documents/test_block.py @@ -282,7 +282,7 @@ class TestBlock(unittest.TestCase): block = Block.from_signed_raw(raw_block) self.assertEqual(block.version, 11) self.assertEqual(block.currency, "zeta_brouzouf") - self.assertEqual(block.noonce, 45079) + self.assertEqual(block.nonce, 45079) self.assertEqual(block.number, 15) self.assertEqual(block.powmin, 4) self.assertEqual(block.time, 1418083330) @@ -305,7 +305,7 @@ class TestBlock(unittest.TestCase): block = Block.from_signed_raw(raw_block_zero) self.assertEqual(block.version, 11) self.assertEqual(block.currency, "zeta_brouzouf") - self.assertEqual(block.noonce, 2125) + self.assertEqual(block.nonce, 2125) self.assertEqual(block.number, 0) self.assertEqual(block.powmin, 3) self.assertEqual(block.time, 1418077277) @@ -354,7 +354,7 @@ class TestBlock(unittest.TestCase): self.assertEqual(from_rendered_raw.version, 11) self.assertEqual(from_rendered_raw.currency, "zeta_brouzouf") - self.assertEqual(from_rendered_raw.noonce, 45079) + self.assertEqual(from_rendered_raw.nonce, 45079) self.assertEqual(from_rendered_raw.number, 15) self.assertEqual(from_rendered_raw.powmin, 4) self.assertEqual(from_rendered_raw.time, 1418083330) @@ -387,7 +387,7 @@ class TestBlock(unittest.TestCase): self.assertEqual(from_rendered_raw.version, 11) self.assertEqual(from_rendered_raw.currency, "zeta_brouzouf") - self.assertEqual(from_rendered_raw.noonce, 2125) + self.assertEqual(from_rendered_raw.nonce, 2125) self.assertEqual(from_rendered_raw.number, 0) self.assertEqual(from_rendered_raw.powmin, 3) self.assertEqual(from_rendered_raw.time, 1418077277) @@ -413,7 +413,7 @@ class TestBlock(unittest.TestCase): self.assertEqual(from_rendered_raw.version, 11) self.assertEqual(from_rendered_raw.currency, "meta_brouzouf") - self.assertEqual(from_rendered_raw.noonce, 581) + self.assertEqual(from_rendered_raw.nonce, 581) self.assertEqual(from_rendered_raw.number, 34436) self.assertEqual(from_rendered_raw.powmin, 5) self.assertEqual(from_rendered_raw.time, 1443896211) @@ -439,7 +439,7 @@ class TestBlock(unittest.TestCase): from_rendered_raw = block.from_signed_raw(rendered_raw) self.assertEqual(from_rendered_raw.version, 11) self.assertEqual(from_rendered_raw.currency, "meta_brouzouf") - self.assertEqual(from_rendered_raw.noonce, 9906) + self.assertEqual(from_rendered_raw.nonce, 9906) self.assertEqual(from_rendered_raw.number, 34895) self.assertEqual(from_rendered_raw.powmin, 4) self.assertEqual(from_rendered_raw.time, 1444434128)