ETCM-732: Always reorganize chain in case of error.

Author: milenkara

src/it/scala/io/iohk/ethereum/ledger/BlockImporterItSpec.scala

@@ -15,11 +15,11 @@ import io.iohk.ethereum.ledger.Ledger.BlockResult
 import io.iohk.ethereum.mpt.MerklePatriciaTrie
 import io.iohk.ethereum.utils.Config
 import io.iohk.ethereum.utils.Config.SyncConfig
-import io.iohk.ethereum.{Fixtures, Mocks, ObjectGenerators, crypto}
+import io.iohk.ethereum.{Fixtures, LongPatience, Mocks, ObjectGenerators, crypto}
 import monix.execution.Scheduler
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.BeforeAndAfterAll
-import org.scalatest.concurrent.Eventually.eventually
+import org.scalatest.concurrent.Eventually
 import org.scalatest.flatspec.AsyncFlatSpecLike
 import org.scalatest.matchers.should.Matchers
 
@@ -30,10 +30,12 @@ class BlockImporterItSpec
     with TestSetupWithVmAndValidators
     with AsyncFlatSpecLike
     with Matchers
-    with BeforeAndAfterAll {
+    with BeforeAndAfterAll
+    with Eventually {
 
   implicit val testScheduler = Scheduler.fixedPool("test", 32)
 
+
   override def afterAll(): Unit = {
     testScheduler.shutdown()
     testScheduler.awaitTermination(60.second)
@@ -150,7 +152,7 @@ class BlockImporterItSpec
     blockImporter ! BlockFetcher.PickedBlocks(NonEmptyList.fromListUnsafe(newBranch))
 
     //because the blocks are not valid, we shouldn't reorganise, but at least stay with a current chain, and the best block of the current chain is oldBlock4
-    eventually { blockchain.getBestBlock().get shouldEqual oldBlock4 }
+    eventually {Thread.sleep(1000); blockchain.getBestBlock().get shouldEqual oldBlock4 }
   }
 
   it should "return a correct new best block after reorganising longer chain to a shorter one if its weight is bigger" in {
@@ -162,7 +164,7 @@ class BlockImporterItSpec
 
     blockImporter ! BlockFetcher.PickedBlocks(NonEmptyList.fromListUnsafe(newBranch))
 
-    eventually { Thread.sleep(200); blockchain.getBestBlock().get shouldEqual newBlock3 }
+    eventually { Thread.sleep(1000); blockchain.getBestBlock().get shouldEqual newBlock3 }
   }
 
   it should "return Unknown branch, in case of PickedBlocks with block that has a parent that's not in the chain" in {
@@ -189,7 +191,7 @@ class BlockImporterItSpec
     //not reorganising anymore until oldBlock4(not part of the chain anymore), no block/ommer validation when not part of the chain, resolveBranch is returning UnknownBranch
     blockImporter ! BlockFetcher.PickedBlocks(NonEmptyList.fromListUnsafe(List(newBlock5ParentOldBlock4)))
 
-    eventually { blockchain.getBestBlock().get shouldEqual newBlock4ParentOldBlock3 }
+    eventually {Thread.sleep(1000); blockchain.getBestBlock().get shouldEqual newBlock4ParentOldBlock3 }
   }
 
   it should "switch to a branch with a checkpoint" in {
@@ -202,8 +204,8 @@ class BlockImporterItSpec
 
     blockImporter ! BlockFetcher.PickedBlocks(NonEmptyList.fromListUnsafe(newBranch))
 
-    eventually { blockchain.getBestBlock().get shouldEqual oldBlock5WithCheckpoint }
-    eventually { blockchain.getLatestCheckpointBlockNumber() shouldEqual oldBlock5WithCheckpoint.header.number }
+    eventually { Thread.sleep(1000);  blockchain.getBestBlock().get shouldEqual oldBlock5WithCheckpoint }
+    eventually { Thread.sleep(1000); blockchain.getLatestCheckpointBlockNumber() shouldEqual oldBlock5WithCheckpoint.header.number }
   }
 
   it should "switch to a branch with a newer checkpoint" in {
@@ -216,8 +218,8 @@ class BlockImporterItSpec
 
     blockImporter ! BlockFetcher.PickedBlocks(NonEmptyList.fromListUnsafe(newBranch))
 
-    eventually { blockchain.getBestBlock().get shouldEqual newBlock4WithCheckpoint }
-    eventually { blockchain.getLatestCheckpointBlockNumber() shouldEqual newBlock4WithCheckpoint.header.number }
+    eventually {Thread.sleep(1000);  blockchain.getBestBlock().get shouldEqual newBlock4WithCheckpoint }
+    eventually {Thread.sleep(1000);  blockchain.getLatestCheckpointBlockNumber() shouldEqual newBlock4WithCheckpoint.header.number }
   }
 
   it should "return a correct checkpointed block after receiving a request for generating a new checkpoint" in {
@@ -264,9 +266,8 @@ class BlockImporterItSpec
     blockImporter ! BlockFetcher.PickedBlocks(NonEmptyList.fromListUnsafe(List(invalidBlock)))
 
     eventually {
-      Thread.sleep(1000)
-
-      val msg = fetcherProbe.fishForMessage() {
+      Thread.sleep(1000);
+      val msg = fetcherProbe.fishForMessage(5.seconds) {
         case BlockFetcher.FetchStateNode(_) => true
         case _ => false
       }.asInstanceOf[BlockFetcher.FetchStateNode]

src/main/scala/io/iohk/ethereum/ledger/BlockImport.scala

@@ -188,9 +188,6 @@ class BlockImport(
       case None =>
         Right(oldBlocksData.map(_.block), executedBlocks.map(_.block), executedBlocks.map(_.weight))
 
-      case Some(MPTError(reason)) if reason.isInstanceOf[MissingNodeException] =>
-        Left(MPTError(reason))
-
       case Some(error) =>
         revertChainReorganisation(newBranch, oldBlocksData, executedBlocks)
         Left(error)