Fix for nested reorg situation

planetarium · Sep 10, 2020 · 0815f28 · 0815f28
1 parent 2aba33f
commit 0815f28
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -251,6 +251,8 @@ To be released.
     reconnecting.  [[#957], [#972]]
  -  Fixed a bug that `Swarm<T>` had not received block headers after failing
     to recevie previous blocks.  [[#996]]
+ -  Fixed a bug that `Swarm<T>` had thrown `InvalidGenesisBlockException`
+    when reorganizing repeatedly.  [[#996]]
 
 ### CLI tools
 

diff --git a/Libplanet/Net/Swarm.cs b/Libplanet/Net/Swarm.cs
@@ -1810,10 +1810,7 @@ out HashDigest<SHA256> branchPoint
                     {
                         _logger.Debug("It doesn't need to fork.");
                     }
-
-                    // We can omit this clause if assume every chain shares
-                    // same genesis block...
-                    else if (!BlockChain.ContainsBlock(branchPoint))
+                    else if (!workspace.ContainsBlock(branchPoint))
                     {
                         // FIXME: This behavior can unexpectedly terminate the swarm (and the game
                         // app) if it encounters a peer having a different blockchain, and therefore