Merge pull request #418 from NethermindEth/streamRlp

Stream rlp
NethermindEth · Mar 17, 2019 · d7621b6 · d7621b6
2 parents fd0e0d4 + 91255d8
commit d7621b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Nethermind/Ethereum.PoW.Test/EthashTests.cs b/src/Nethermind/Ethereum.PoW.Test/EthashTests.cs
@@ -73,7 +73,7 @@ public void Test(EthashTest test)
             Assert.AreEqual(test.Nonce, blockHeader.Nonce, "header nonce vs test nonce");
             Assert.AreEqual(test.MixHash.Bytes, blockHeader.MixHash.Bytes, "header mix hash vs test mix hash");
 
-            Keccak headerHash = Keccak.Compute(Rlp.Encode(blockHeader, RlpBehaviors.ExcludeBlockMixHashAndNonce));
+            Keccak headerHash = Keccak.Compute(Rlp.Encode(blockHeader, RlpBehaviors.ForSealing));
             Assert.AreEqual(test.HeaderHash, headerHash, "header hash");
 
             // seed is correct

diff --git a/src/Nethermind/Nethermind.Db/SimpleFilePublicKeyDb.cs b/src/Nethermind/Nethermind.Db/SimpleFilePublicKeyDb.cs
@@ -29,6 +29,7 @@
 
 namespace Nethermind.Db
 {
+    // TODO: replace or optimize
     public class SimpleFilePublicKeyDb : IFullDb
     {
         private readonly ILogger _logger;
@@ -92,13 +93,13 @@ public void CommitBatch()
             {
                 foreach (var keyValuePair in snapshot)
                 {
-                    streamWriter.WriteLine($"{keyValuePair.Key},{keyValuePair.Value.ToHexString()}");
+                    streamWriter.Write(string.Concat(keyValuePair.Key, ",", keyValuePair.Value.ToHexString()));
                 }
             }
 
             RemoveBackup(tempFilePath);
 
-            _perfService.EndPerfCalc(key, $"Db commit ({_dbLastDirName}), items count: {snapshot.Length}");
+            _perfService.EndPerfCalc(key);
         }
 
         private void RemoveBackup(string tempFilePath)