Merge conflict resolve

planetarium · Jul 6, 2021 · 85cd2e4 · 85cd2e4
1 parent cd3aea0
commit 85cd2e4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Libplanet/Blocks/Block.cs b/Libplanet/Blocks/Block.cs
@@ -103,14 +103,14 @@ public Block(
             {
                 _preEvaluationHash = preEvaluationBlockHash;
                 StateRootHash = stateRootHash;
-                _hash = Hashcash.Hash(Header.SerializeForHash());
+                _hash = new BlockHash(Header.Hash);
             }
             else
             {
                 // FIXME: This only works due to sanity constraint on usage.
-                _preEvaluationHash = Hashcash.Hash(Header.SerializeForPreEvaluationHash());
+                _preEvaluationHash = new BlockHash(Header.PreEvaluationHash);
                 StateRootHash = stateRootHash;
-                _hash = _preEvaluationHash;
+                _hash = new BlockHash(Header.Hash);
             }
 
             // As the order of transactions should be unpredictable until a block is mined,