Small cleanup

Author: Petra Bierleutgeb

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

@@ -25,18 +25,23 @@ object Blacklist {
   }
 }
 
-final case class CacheBasedBlacklist(cache: Cache[BlacklistId, String])
-    extends Blacklist with Logger {
+final case class CacheBasedBlacklist(cache: Cache[BlacklistId, String]) extends Blacklist with Logger {
 
   override def isBlacklisted(id: BlacklistId): Boolean = cache.getIfPresent(id).isDefined
 
   override def add(id: BlacklistId, duration: FiniteDuration, reason: String): Unit =
-    cache.policy().expireVariably().toScala.fold {
-      log.warn(s"Unexpected error while adding peer [${id.value}] to blacklist using custom expiration time. Falling back to default expiration.")
-      cache.put(id, reason)
-    } { varExpirationPolicy =>
-      varExpirationPolicy.put(id, reason, duration.toJava)
-    }
+    cache
+      .policy()
+      .expireVariably()
+      .toScala
+      .fold {
+        log.warn(
+          s"Unexpected error while adding peer [${id.value}] to blacklist using custom expiration time. Falling back to default expiration."
+        )
+        cache.put(id, reason)
+      } { varExpirationPolicy =>
+        varExpirationPolicy.put(id, reason, duration.toJava)
+      }
   override def remove(id: BlacklistId): Unit = cache.invalidate(id)
 
   override def keys: Set[BlacklistId] = cache.underlying.asMap().keySet().asScala.toSet
@@ -47,10 +52,14 @@ object CacheBasedBlacklist {
   def empty(maxSize: Int): CacheBasedBlacklist = {
     val cache =
       Scaffeine()
-        .expireAfter[BlacklistId, String](create = (_, _) => 60.minutes,
+        .expireAfter[BlacklistId, String](
+          create = (_, _) => 60.minutes,
           update = (_, _, _) => 60.minutes,
-          read = (_, _, _) => 60.minutes) // required to enable VarExpiration policy (i.e. set custom expiration time per element)
-        .maximumSize(maxSize) // uses Window TinyLfu eviction policy, see https://github.com/ben-manes/caffeine/wiki/Efficiency
+          read = (_, _, _) => 60.minutes
+        ) // required to enable VarExpiration policy (i.e. set custom expiration time per element)
+        .maximumSize(
+          maxSize
+        ) // uses Window TinyLfu eviction policy, see https://github.com/ben-manes/caffeine/wiki/Efficiency
         .build[BlacklistId, String]()
     CacheBasedBlacklist(cache)
   }

src/main/scala/io/iohk/ethereum/blockchain/sync/fast/FastSync.scala

@@ -59,9 +59,7 @@ class FastSync(
 
   override def receive: Receive = idle
 
-  def handleCommonMessages: Receive = handlePeerListMessages
-
-  def idle: Receive = handleCommonMessages orElse {
+  def idle: Receive = handlePeerListMessages orElse {
     case SyncProtocol.Start => start()
     case SyncProtocol.GetStatus => sender() ! SyncProtocol.Status.NotSyncing
   }
@@ -90,7 +88,7 @@ class FastSync(
     context become waitingForPivotBlock
   }
 
-  def waitingForPivotBlock: Receive = handleCommonMessages orElse {
+  def waitingForPivotBlock: Receive = handlePeerListMessages orElse {
     case SyncProtocol.GetStatus => sender() ! SyncProtocol.Status.NotSyncing
     case PivotBlockSelector.Result(pivotBlockHeader) =>
       if (pivotBlockHeader.number < 1) {
@@ -161,7 +159,7 @@ class FastSync(
         syncState = syncState.copy(downloadedNodesCount = saved, totalNodesCount = saved + missing)
     }
 
-    def receive: Receive = handleCommonMessages orElse handleStatus orElse {
+    def receive: Receive = handlePeerListMessages orElse handleStatus orElse {
       case UpdatePivotBlock(reason) => updatePivotBlock(reason)
       case WaitingForNewTargetBlock =>
         log.info("State sync stopped until receiving new pivot block")
@@ -248,7 +246,7 @@ class FastSync(
     }
 
     def waitingForPivotBlockUpdate(updateReason: PivotBlockUpdateReason): Receive =
-      handleCommonMessages orElse handleStatus orElse {
+      handlePeerListMessages orElse handleStatus orElse {
         case PivotBlockSelector.Result(pivotBlockHeader)
             if newPivotIsGoodEnough(pivotBlockHeader, syncState, updateReason) =>
           log.info("New pivot block with number {} received", pivotBlockHeader.number)