Remove scala.collection.immutable

Author: Christos KK Loverdos

src/main/scala/io/iohk/ethereum/consensus/blocks/BlockGeneratorSkeleton.scala

@@ -18,7 +18,6 @@ import io.iohk.ethereum.network.p2p.messages.PV62.BlockHeaderImplicits._
 import io.iohk.ethereum.utils.BlockchainConfig
 import io.iohk.ethereum.utils.ByteUtils.or
 
-import scala.collection.immutable
 
 /**
  * This is a skeleton for a generic [[io.iohk.ethereum.consensus.blocks.BlockGenerator BlockGenerator]].
@@ -43,7 +42,8 @@ abstract class BlockGeneratorSkeleton(
 
   protected val cache: AtomicReference[List[PendingBlockAndState]] = new AtomicReference(Nil)
 
-  protected def newBlockBody(transactions: immutable.Seq[SignedTransaction], ommers: X): BlockBody
+
+  protected def newBlockBody(transactions: Seq[SignedTransaction], ommers: X): BlockBody
 
   protected def defaultPrepareHeader(
     blockNumber: BigInt,
@@ -111,9 +111,9 @@ abstract class BlockGeneratorSkeleton(
   protected def prepareTransactions(
     transactions: Seq[SignedTransaction],
     blockGasLimit: BigInt
-  ): immutable.Seq[SignedTransaction] = {
+  ): Seq[SignedTransaction] = {
 
-    val sortedTransactions: immutable.Seq[SignedTransaction] = transactions
+    val sortedTransactions: Seq[SignedTransaction] = transactions
       .groupBy(_.senderAddress).values.toList
       .flatMap { txsFromSender =>
         val ordered = txsFromSender
@@ -133,7 +133,7 @@ abstract class BlockGeneratorSkeleton(
       .reverse
       .flatMap { case (_, txs) => txs }
 
-    val transactionsForBlock: immutable.Seq[SignedTransaction] = sortedTransactions
+    val transactionsForBlock: Seq[SignedTransaction] = sortedTransactions
       .scanLeft(BigInt(0), None: Option[SignedTransaction]) { case ((accumulatedGas, _), stx) => (accumulatedGas + stx.tx.gasLimit, Some(stx)) }
       .collect { case (gas, Some(stx)) => (gas, stx) }
       .takeWhile { case (gas, _) => gas <= blockGasLimit }

src/main/scala/io/iohk/ethereum/consensus/blocks/NoOmmersBlockGenerator.scala

@@ -6,7 +6,6 @@ import io.iohk.ethereum.ledger.{BlockPreparationError, BlockPreparator}
 import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody
 import io.iohk.ethereum.utils.BlockchainConfig
 
-import scala.collection.immutable
 
 abstract class NoOmmersBlockGenerator(
   blockchain: Blockchain,
@@ -24,7 +23,7 @@ abstract class NoOmmersBlockGenerator(
 
   type X = Nil.type
 
-  protected def newBlockBody(transactions: immutable.Seq[SignedTransaction], ommers: Nil.type): BlockBody = {
+  protected def newBlockBody(transactions: Seq[SignedTransaction], ommers: Nil.type): BlockBody = {
     BlockBody(transactions, ommers)
   }
 

src/main/scala/io/iohk/ethereum/consensus/ethash/blocks/EthashBlockGenerator.scala

@@ -12,7 +12,6 @@ import io.iohk.ethereum.ledger.{BlockPreparationError, BlockPreparator}
 import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody
 import io.iohk.ethereum.utils.BlockchainConfig
 
-import scala.collection.immutable
 
 /** Internal API, used for testing (especially mocks) */
 trait EthashBlockGenerator extends TestBlockGenerator {
@@ -39,7 +38,7 @@ class EthashBlockGeneratorImpl(
   blockTimestampProvider
 ) with EthashBlockGenerator {
 
-  protected def newBlockBody(transactions: immutable.Seq[SignedTransaction], ommers: Ommers): BlockBody = {
+  protected def newBlockBody(transactions: Seq[SignedTransaction], ommers: Ommers): BlockBody = {
     BlockBody(transactions, ommers)
   }