Merge remote-tracking branch 'origin/phase/beta1' into fix/downloadMptFirst

Author: adamsmo

src/main/scala/io/iohk/ethereum/blockchain/sync/SyncBlockBodiesRequestHandler.scala

@@ -21,6 +21,7 @@ class SyncBlockBodiesRequestHandler(
     if (blockBodies.bodies.isEmpty) {
       val reason = s"got empty block bodies response for known hashes: ${requestedHashes.map(h => Hex.toHexString(h.toArray[Byte]))}"
       syncController ! BlacklistSupport.BlacklistPeer(peer.id, reason)
+      syncController ! FastSync.EnqueueBlockBodies(requestedHashes)
     } else {
       syncController ! BlockBodiesReceived(peer, requestedHashes, blockBodies.bodies)
     }

src/test/scala/io/iohk/ethereum/blockchain/sync/FastSyncBlockBodiesRequestHandlerSpec.scala

@@ -41,6 +41,7 @@ class FastSyncBlockBodiesRequestHandlerSpec extends FlatSpec with Matchers {
     peerMessageBus.reply(MessageFromPeer(BlockBodies(responseBodies), peer.id))
 
     parent.expectMsg(BlacklistSupport.BlacklistPeer(peer.id, "got empty block bodies response for known hashes: List(31, 32)"))
+    parent.expectMsg(FastSync.EnqueueBlockBodies(requestedHashes))
     parent.expectMsg(SyncRequestHandler.Done)
 
     peerMessageBus.expectMsg(Unsubscribe(PeerDisconnectedClassifier(PeerSelector.WithId(peer.id))))