Scalafmt fixes

Author: Dmitry Voronov

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

@@ -31,13 +31,13 @@ trait ReceiptsValidator {
       case (Some(header), receipt) =>
         validators.blockValidator.validateBlockAndReceipts(header, receipt) match {
           case Left(err) => Some(Invalid(err))
-          case _         => None
+          case _ => None
         }
       case (None, _) => Some(DbError)
     }
 
-    val receiptsValidationError = errorIterator.collectFirst {
-      case Some(error) => error
+    val receiptsValidationError = errorIterator.collectFirst { case Some(error) =>
+      error
     }
 
     receiptsValidationError.getOrElse(Valid(blockHashesWithReceipts))

src/main/scala/io/iohk/ethereum/db/storage/AppStateStorage.scala

@@ -15,10 +15,12 @@ import scala.collection.immutable.ArraySeq
 class AppStateStorage(val dataSource: DataSource) extends TransactionalKeyValueStorage[Key, Value] {
 
   val namespace: IndexedSeq[Byte] = Namespaces.AppStateNamespace
-  def keySerializer: Key => IndexedSeq[Byte] = k => ArraySeq.unsafeWrapArray(k.getBytes(StorageStringCharset.UTF8Charset))
+  def keySerializer: Key => IndexedSeq[Byte] = k =>
+    ArraySeq.unsafeWrapArray(k.getBytes(StorageStringCharset.UTF8Charset))
 
   def keyDeserializer: IndexedSeq[Byte] => Key = k => new String(k.toArray, StorageStringCharset.UTF8Charset)
-  def valueSerializer: String => IndexedSeq[Byte] = k => ArraySeq.unsafeWrapArray(k.getBytes(StorageStringCharset.UTF8Charset))
+  def valueSerializer: String => IndexedSeq[Byte] = k =>
+    ArraySeq.unsafeWrapArray(k.getBytes(StorageStringCharset.UTF8Charset))
   def valueDeserializer: IndexedSeq[Byte] => String = (valueBytes: IndexedSeq[Byte]) =>
     new String(valueBytes.toArray, StorageStringCharset.UTF8Charset)
 

src/main/scala/io/iohk/ethereum/db/storage/BlockNumberMappingStorage.scala

@@ -12,7 +12,7 @@ class BlockNumberMappingStorage(val dataSource: DataSource)
     extends TransactionalKeyValueStorage[BigInt, BlockHeaderHash] {
   override val namespace: IndexedSeq[Byte] = Namespaces.HeightsNamespace
 
-  override def keySerializer: (BigInt) => IndexedSeq[Byte] = index => ArraySeq.unsafeWrapArray( index.toByteArray )
+  override def keySerializer: (BigInt) => IndexedSeq[Byte] = index => ArraySeq.unsafeWrapArray(index.toByteArray)
 
   override def keyDeserializer: IndexedSeq[Byte] => BigInt = bytes => new BigInt(new BigInteger(bytes.toArray))
 

src/main/scala/io/iohk/ethereum/db/storage/FastSyncStateStorage.scala

@@ -35,7 +35,8 @@ class FastSyncStateStorage(val dataSource: DataSource)
       .addConcreteType[EvmCodeHash]
       .addConcreteType[StorageRootHash]
 
-  override def keySerializer: String => IndexedSeq[Byte] = k => ArraySeq.unsafeWrapArray(k.getBytes(StorageStringCharset.UTF8Charset))
+  override def keySerializer: String => IndexedSeq[Byte] = k =>
+    ArraySeq.unsafeWrapArray(k.getBytes(StorageStringCharset.UTF8Charset))
 
   override def keyDeserializer: IndexedSeq[Byte] => String = b =>
     new String(b.toArray, StorageStringCharset.UTF8Charset)

src/main/scala/io/iohk/ethereum/db/storage/TransactionalKeyValueStorage.scala

@@ -61,7 +61,8 @@ trait TransactionalKeyValueStorage[K, V] {
       result.map { case (key, value) =>
         val kseq = keyDeserializer(ArraySeq.unsafeWrapArray(key))
         val vseq = valueDeserializer(ArraySeq.unsafeWrapArray(value))
-        (kseq, vseq) }
+        (kseq, vseq)
+      }
     }
   }
 }

src/main/scala/io/iohk/ethereum/faucet/jsonrpc/FaucetBuilder.scala

@@ -97,10 +97,12 @@ trait ShutdownHookBuilder {
 
   def shutdown(): Unit = {
     Await.ready(
-      system.terminate().map(
-        _ ->
-          log.info("actor system finished")
-      )(system.dispatcher),
+      system
+        .terminate()
+        .map(
+          _ ->
+            log.info("actor system finished")
+        )(system.dispatcher),
       faucetConfig.shutdownTimeout
     )
   }

src/main/scala/io/iohk/ethereum/jsonrpc/EthJsonMethodsImplicits.scala

@@ -565,12 +565,11 @@ object EthJsonMethodsImplicits extends JsonMethodsImplicits {
     def toEitherOpt[A, B](opt: Option[Either[A, B]]): Either[A, Option[B]] = {
       opt match {
         case Some(Right(v)) => Right(Option(v))
-        case Some(Left(e))  => Left(e)
-        case None           => Right(None)
+        case Some(Left(e)) => Left(e)
+        case None => Right(None)
       }
     }
 
-
     for {
       from <- toEitherOpt((obj \ "from").extractOpt[String].map(extractBytes))
       to <- toEitherOpt((obj \ "to").extractOpt[String].map(extractBytes))

src/main/scala/io/iohk/ethereum/jsonrpc/EthService.scala

@@ -649,7 +649,9 @@ class EthService(
       case Right(data) =>
         call(CallRequest(CallTx(tx.from, tx.to, tx.gas, tx.gasPrice, tx.value, ByteString(data)), req.block))
           .map(_.map { callResponse =>
-            IeleCallResponse(rlp.decode[Seq[ByteString]](callResponse.returnData.toArray[Byte])(seqEncDec[ByteString]()))
+            IeleCallResponse(
+              rlp.decode[Seq[ByteString]](callResponse.returnData.toArray[Byte])(seqEncDec[ByteString]())
+            )
           })
       case Left(error) => Task.now(Left(error))
     }

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

@@ -313,7 +313,7 @@ class BlockPreparator(
 
         val validatedStx = for {
           accData <- accountDataOpt
-          _       <- signedTxValidator.validate(stx, accData._1, blockHeader, upfrontCost, acumGas)
+          _ <- signedTxValidator.validate(stx, accData._1, blockHeader, upfrontCost, acumGas)
         } yield (accData)
 
         validatedStx match {

src/main/scala/io/iohk/ethereum/network/PeerEventBusActor.scala

@@ -82,9 +82,8 @@ object PeerEventBusActor {
       * @param subscriber
       */
     override def unsubscribe(subscriber: ActorRef): Unit = {
-      messageSubscriptions = messageSubscriptions.filter {
-        case ((sub, _), _) =>
-          sub != subscriber
+      messageSubscriptions = messageSubscriptions.filter { case ((sub, _), _) =>
+        sub != subscriber
       }
       connectionSubscriptions = connectionSubscriptions.filterNot(_.subscriber == subscriber)
     }

src/main/scala/io/iohk/ethereum/network/rlpx/AuthInitiateMessage.scala

@@ -45,7 +45,6 @@ case class AuthInitiateMessage(
     ByteString(if (knownPeer) 1.toByte else 0.toByte)
   )
 
-
 //  lazy val encoded: ByteString = {
 //    encodeECDSA(signature) ++
 //      ephemeralPublicHash ++

src/main/scala/io/iohk/ethereum/nodebuilder/StdNode.scala

@@ -84,10 +84,12 @@ abstract class BaseNode extends Node {
     tryAndLogFailure(() => consensus.stopProtocol())
     tryAndLogFailure(() =>
       Await.ready(
-        system.terminate().map(
-          _ ->
-            log.info("actor system finished")
-        ),
+        system
+          .terminate()
+          .map(
+            _ ->
+              log.info("actor system finished")
+          ),
         shutdownTimeoutDuration
       )
     )

src/test/scala/io/iohk/ethereum/jsonrpc/server/http/JsonRpcHttpServerSpec.scala

@@ -469,7 +469,7 @@ class FakeJsonRpcHttpServer(
   def run(): Unit = ()
   override def corsAllowedOrigins: HttpOriginMatcher = cors
 
-  var mockedTime:Long = 0L
+  var mockedTime: Long = 0L
 
   override protected val rateLimit: RateLimit = new RateLimit(config.rateLimit) {
     override protected def getCurrentTimeNanos: Long = FakeJsonRpcHttpServer.this.mockedTime

src/test/scala/io/iohk/ethereum/ledger/BlockPreparatorSpec.scala

@@ -10,7 +10,15 @@ import io.iohk.ethereum.consensus.validators.{SignedTransactionValid, SignedTran
 import io.iohk.ethereum.crypto.{generateKeyPair, kec256}
 import io.iohk.ethereum.domain._
 import io.iohk.ethereum.ledger.Ledger.{BlockResult, VMImpl}
-import io.iohk.ethereum.vm.{InvalidJump, InvalidOpCode, OutOfGas, ProgramError, RevertOccurs, StackOverflow, StackUnderflow}
+import io.iohk.ethereum.vm.{
+  InvalidJump,
+  InvalidOpCode,
+  OutOfGas,
+  ProgramError,
+  RevertOccurs,
+  StackOverflow,
+  StackUnderflow
+}
 import org.bouncycastle.crypto.AsymmetricCipherKeyPair
 import org.bouncycastle.crypto.params.ECPublicKeyParameters
 import org.scalatest.prop.{TableFor2, TableFor4}

src/test/scala/io/iohk/ethereum/ledger/LedgerSpec.scala

@@ -158,7 +158,8 @@ class LedgerSpec extends AnyFlatSpec with ScalaCheckPropertyChecks with Matchers
     val correctStateRoot: ByteString = applyChanges(validBlockParentHeader.stateRoot, blockchainStorages, changes)
 
     val correctGasUsed: BigInt = 0
-    val incorrectStateRoot: ByteString = concatByteStrings(((correctStateRoot.head + 1) & 0xff).toByte, correctStateRoot.tail)
+    val incorrectStateRoot: ByteString =
+      concatByteStrings(((correctStateRoot.head + 1) & 0xff).toByte, correctStateRoot.tail)
     val table: TableFor3[ByteString, BigInt, Validators] = Table[ByteString, BigInt, Validators](
       ("stateRootHash", "cumulativeGasUsedBlock", "validators"),
       (correctStateRoot, correctGasUsed + 1, new Mocks.MockValidatorsAlwaysSucceed),

src/test/scala/io/iohk/ethereum/network/handshaker/EtcHandshakerSpec.scala

@@ -219,7 +219,7 @@ class EtcHandshakerSpec extends AnyFlatSpec with Matchers {
 
   it should "fail if a status msg is received with invalid genesisHash" in new LocalPeerPV63Setup
     with RemotePeerPV63Setup {
-    val wrongGenesisHash = concatByteStrings( (localStatus.genesisHash.head + 1).toByte, localStatus.genesisHash.tail)
+    val wrongGenesisHash = concatByteStrings((localStatus.genesisHash.head + 1).toByte, localStatus.genesisHash.tail)
 
     val handshakerAfterHelloOpt = initHandshakerWithResolver.applyMessage(remoteHello)
     val handshakerAfterStatusOpt =

src/test/scala/io/iohk/ethereum/network/p2p/messages/NodeDataSpec.scala

@@ -51,9 +51,10 @@ class NodeDataSpec extends AnyFlatSpec with Matchers {
   )
 
   val encodedBranchNode = {
-    val encodeableList: Array[RLPEncodeable] = (Array.fill[RLPValue](3)(RLPValue(Array.emptyByteArray)) :+ (exampleHash: RLPEncodeable)) ++
-      (Array.fill[RLPValue](6)(RLPValue(Array.emptyByteArray)) :+ (exampleHash: RLPEncodeable)) ++
-      (Array.fill[RLPValue](5)(RLPValue(Array.emptyByteArray)) :+ (Array.emptyByteArray: RLPEncodeable))
+    val encodeableList: Array[RLPEncodeable] =
+      (Array.fill[RLPValue](3)(RLPValue(Array.emptyByteArray)) :+ (exampleHash: RLPEncodeable)) ++
+        (Array.fill[RLPValue](6)(RLPValue(Array.emptyByteArray)) :+ (exampleHash: RLPEncodeable)) ++
+        (Array.fill[RLPValue](5)(RLPValue(Array.emptyByteArray)) :+ (Array.emptyByteArray: RLPEncodeable))
     RLPList(ArraySeq.unsafeWrapArray(encodeableList): _*)
   }