calculate block id based on block hash

codexvalidator/basics.nim

@@ -1,7 +1,7 @@
 import std/sequtils
+import pkg/stint
+import pkg/questionable
 
 export sequtils
-
-import pkg/stint
-
 export stint
+export questionable

codexvalidator/blocks.nim

@@ -7,3 +7,7 @@ export blck
 import ./blocks/serialization
 
 export serialization.toBytes
+
+import ./blocks/blockhash
+
+export blockhash.id

codexvalidator/blocks/blck.nim

@@ -1,12 +1,15 @@
-import pkg/mysticeti
+from pkg/mysticeti import CommitteeMember, `==`
+import ../basics
 import ../transaction
+import ../hashing
 import ./blockid
 
 export mysticeti.CommitteeMember
+export mysticeti.`==`
 
 type Block* = ref object
   author*: CommitteeMember
   round*: uint64
-  parents*: seq[blockid.BlockId]
+  parents*: seq[BlockId]
   transactions*: seq[Transaction]
-  id*: blockid.BlockId
+  hash*: ?Hash

codexvalidator/blocks/blockhash.nim

@@ -0,0 +1,15 @@
+import ../basics
+import ./blck
+import ./blockid
+import ./serialization
+import ../hashing
+
+func id*(blck: Block): BlockId =
+  without var hash =? blck.hash:
+    hash = Hash.hash(blck.toBytes())
+    blck.hash = some hash
+  BlockId.init(
+    blck.author,
+    blck.round,
+    hash
+  )

tests/codexvalidator/basics.nim

@@ -1,11 +1,11 @@
 import std/unittest
-
-export unittest
-
 import std/sequtils
-
-export sequtils
-
 import pkg/stint
 
+export unittest
+export sequtils
 export stint
+
+import ./examples
+
+export examples

tests/codexvalidator/blocks/testBlock.nim

@@ -0,0 +1,12 @@
+import ../basics
+import codexvalidator/blocks
+import codexvalidator/hashing
+
+suite "Blocks":
+
+  test "have a correct block id":
+    let blck = Block.example
+    check blck.id.author == blck.author
+    check blck.id.round == blck.round
+    check blck.id.hash == Hash.hash(blck.toBytes())
+

tests/codexvalidator/blocks/testSerialization.nim

@@ -3,7 +3,6 @@ import codexvalidator/blocks
 import codexvalidator/blocks/serialization
 import codexvalidator/transaction/serialization
 import codexvalidator/hashing
-import ../examples
 
 suite "Block serialization":
 

tests/codexvalidator/testSignatures.nim

@@ -1,7 +1,6 @@
 import ./basics
 import pkg/blscurve
 import codexvalidator/signatures
-import ./examples
 
 suite "Signature scheme":
 

tests/codexvalidator/transaction/testSerialization.nim

@@ -1,7 +1,6 @@
 import ../basics
 import codexvalidator/transaction
 import codexvalidator/transaction/serialization
-import ../examples
 
 suite "Transaction serialization":
 

tests/codexvalidator/transaction/testSigning.nim

@@ -1,7 +1,6 @@
 import ../basics
 import codexvalidator/signatures
 import codexvalidator/transaction
-import ../examples
 
 suite "Transaction signing":
 

tests/codexvalidator/transaction/testTransaction.nim

@@ -1,6 +1,5 @@
 import ../basics
 import codexvalidator/transaction
-import ../examples
 
 suite "Transaction":
 

tests/tests.nim

@@ -2,6 +2,7 @@ import ./codexvalidator/testSignatures
 import ./codexvalidator/transaction/testTransaction
 import ./codexvalidator/transaction/testSigning
 import ./codexvalidator/transaction/testSerialization
+import ./codexvalidator/blocks/testBlock
 import ./codexvalidator/blocks/testSerialization
 
 {.warning[UnusedImport]:off.}