blockHash function moved to BlockValidationLogic

rchain · stanislavlyalin · Aug 8, 2022 · Aug 8, 2022 · Aug 8, 2022 · Aug 8, 2022
commit beebdeee57a9929d76b5bd09fce209603d68316b
diff --git a/casper/src/main/scala/coop/rchain/casper/BlockValidationLogic.scala b/casper/src/main/scala/coop/rchain/casper/BlockValidationLogic.scala
@@ -3,6 +3,7 @@ package coop.rchain.casper
 import cats.syntax.all._
 import coop.rchain.casper.Validate.signatureVerifiers
 import coop.rchain.casper.protocol.BlockMessage
+import coop.rchain.casper.util.ProtoUtil
 import coop.rchain.models.BlockVersion
 import coop.rchain.models.syntax._
 
@@ -55,4 +56,6 @@ object BlockValidationLogic {
       BlockStatus.invalidDeployShardId.asLeft[ValidBlock]
     }
   }
+
+  def blockHash(b: BlockMessage): Boolean = b.blockHash == ProtoUtil.hashBlock(b)
 }
diff --git a/casper/src/main/scala/coop/rchain/casper/Validate.scala b/casper/src/main/scala/coop/rchain/casper/Validate.scala
@@ -1,9 +1,9 @@
 package coop.rchain.casper
 
+import cats.Monad
 import cats.data.EitherT
 import cats.effect.{Concurrent, Sync}
 import cats.syntax.all._
-import cats.{Applicative, Monad}
 import com.google.protobuf.ByteString
 import coop.rchain.blockstorage.BlockStore
 import coop.rchain.blockstorage.BlockStore.BlockStore
@@ -171,24 +171,6 @@ object Validate {
                }
     } yield status
 
-  def blockHash[F[_]: Applicative: Log](b: BlockMessage): F[Boolean] = {
-    val blockHashComputed = ProtoUtil.hashBlock(b)
-    if (b.blockHash == blockHashComputed)
-      true.pure
-    else {
-      val computedHashString = PrettyPrinter.buildString(blockHashComputed)
-      val hashString         = PrettyPrinter.buildString(b.blockHash)
-      for {
-        _ <- Log[F].warn(
-              ignore(
-                b,
-                s"block hash $hashString does not match to computed value $computedHashString."
-              )
-            )
-      } yield false
-    }
-  }
-
   /**
     * Justification regression check.
     * Compares justifications that has been already used by sender and recorded in the DAG with

diff --git a/casper/src/main/scala/coop/rchain/casper/blocks/BlockReceiver.scala b/casper/src/main/scala/coop/rchain/casper/blocks/BlockReceiver.scala
@@ -9,7 +9,7 @@ import coop.rchain.blockstorage.BlockStore.BlockStore
 import coop.rchain.blockstorage.dag.BlockDagStorage
 import coop.rchain.casper.protocol.BlockMessage
 import coop.rchain.casper.syntax._
-import coop.rchain.casper.{BlockValidationLogic, PrettyPrinter, Validate}
+import coop.rchain.casper.{BlockValidationLogic, PrettyPrinter}
 import coop.rchain.models.BlockHash.BlockHash
 import coop.rchain.shared.Log
 import coop.rchain.shared.syntax._
@@ -205,14 +205,14 @@ object BlockReceiver {
       // TODO: 1. validation and logging in these checks should be separated
       //       2. logging of these block should indicate that information cannot be trusted
       //           e.g. if block hash is invalid it cannot represent identity of a block
-      val validFormat = BlockValidationLogic.formatOfFields(b).pure
-      val validHash   = Validate.blockHash(b)
-      val validSig    = BlockValidationLogic.blockSignature(b).pure
+      val validFormat = BlockValidationLogic.formatOfFields(b)
+      val validHash   = BlockValidationLogic.blockHash(b)
+      val validSig    = BlockValidationLogic.blockSignature(b)
       // TODO: check sender to be valid bonded validator
       //  - not always possible because now are new blocks downloaded from DAG tips
       //    which in case of epoch change sender can be unknown
       // TODO: check valid version (possibly part of hash checking)
-      validFormat &&^ validShard &&^ validHash &&^ validSig
+      validShard &&^ (validFormat && validHash && validSig).pure
     }
 
     // Check if block should be stored

diff --git a/casper/src/main/scala/coop/rchain/casper/engine/NodeSyncing.scala b/casper/src/main/scala/coop/rchain/casper/engine/NodeSyncing.scala
@@ -1,7 +1,7 @@
 package coop.rchain.casper.engine
 
 import cats.effect.concurrent.{Deferred, Ref}
-import cats.effect.{Concurrent, Timer}
+import cats.effect.{Concurrent, Sync, Timer}
 import cats.syntax.all._
 import coop.rchain.blockstorage.BlockStore
 import coop.rchain.blockstorage.BlockStore.BlockStore
@@ -143,7 +143,7 @@ class NodeSyncing[F[_]
                              BlockStore[F].contains(_),
                              BlockStore[F].getUnsafe,
                              BlockStore[F].put(_, _),
-                             Validate.blockHash[F]
+                             block => Sync[F].delay(BlockValidationLogic.blockHash(block))
                            )
 
       // Request tuple space state for Last Finalized State

diff --git a/casper/src/test/scala/coop/rchain/casper/batch2/ValidateTest.scala b/casper/src/test/scala/coop/rchain/casper/batch2/ValidateTest.scala
@@ -500,14 +500,14 @@ class ValidateTest
       val blockValidHash = block.copy(blockHash = hash)
 
       // Test valid block hash
-      val hashValid = Validate.blockHash[Task](blockValidHash).runSyncUnsafe()
+      val hashValid = BlockValidationLogic.blockHash(blockValidHash)
 
       hashValid shouldBe true
 
       val blockInValidHash = block.copy(blockHash = ByteString.copyFromUtf8("123"))
 
       // Test invalid block hash
-      val hashInValid = Validate.blockHash[Task](blockInValidHash).runSyncUnsafe()
+      val hashInValid = BlockValidationLogic.blockHash(blockInValidHash)
 
       hashInValid shouldBe false
     }