etcm-651 added sending checkpoints to all peers

pslaski · bsuieric · commit ba105b18fb69 · 2021-02-24T17:10:25.000+01:00
diff --git a/src/main/scala/io/iohk/ethereum/blockchain/sync/regular/BlockBroadcast.scala b/src/main/scala/io/iohk/ethereum/blockchain/sync/regular/BlockBroadcast.scala
@@ -36,13 +36,17 @@ class BlockBroadcast(val etcPeerManager: ActorRef) {
     newBlock.block.header.number > peerInfo.maxBlockNumber ||
       newBlock.chainWeight > peerInfo.chainWeight
 
-  private def broadcastNewBlock(blockToBroadcast: BlockToBroadcast, peers: Map[Peer, PeerInfo]): Unit =
-    obtainRandomPeerSubset(peers.keySet).foreach { peer =>
+  private def broadcastNewBlock(blockToBroadcast: BlockToBroadcast, peers: Map[Peer, PeerInfo]): Unit = {
+    val peerSubset: Set[Peer] = if (blockToBroadcast.block.hasCheckpoint) {
+      peers.keySet
+    } else obtainRandomPeerSubset(peers.keySet)
+    peerSubset.foreach { peer =>
       val message: MessageSerializable =
         if (peers(peer).remoteStatus.protocolVersion == ProtocolVersions.PV64) blockToBroadcast.as64
         else blockToBroadcast.as63
       etcPeerManager ! EtcPeerManagerActor.SendMessage(message, peer.id)
     }
+  }
 
   private def broadcastNewBlockHash(blockToBroadcast: BlockToBroadcast, peers: Set[Peer]): Unit = peers.foreach {
     peer =>
diff --git a/src/main/scala/io/iohk/ethereum/blockchain/sync/regular/BlockImporter.scala b/src/main/scala/io/iohk/ethereum/blockchain/sync/regular/BlockImporter.scala
@@ -247,7 +247,7 @@ class BlockImporter(
       informFetcherOnFail: Boolean,
       internally: Boolean
   ): ImportFn = {
-    def doLog(entry: ImportMessages.LogEntry): Unit = log.info(entry._2)//log.log(entry._1, entry._2)
+    def doLog(entry: ImportMessages.LogEntry): Unit = log.info(entry._2) //log.log(entry._1, entry._2)
     importWith(
       {
         Task(doLog(importMessages.preImport()))

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ class BlockImporter(`
`247`	`247`	`informFetcherOnFail: Boolean,`
`248`	`248`	`internally: Boolean`
`249`	`249`	`): ImportFn = {`
`250`		`- def doLog(entry: ImportMessages.LogEntry): Unit = log.info(entry._2)//log.log(entry._1, entry._2)`
	`250`	`+ def doLog(entry: ImportMessages.LogEntry): Unit = log.info(entry._2) //log.log(entry._1, entry._2)`
`251`	`251`	`importWith(`
`252`	`252`	`{`
`253`	`253`	`Task(doLog(importMessages.preImport()))`