Static analysis tools fixes

Author: Nicolas Tallar

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

@@ -119,25 +119,26 @@ trait RegularSync {
       blockchain.getBlockHeaderByHash(blocks.head.header.parentHash)
         .flatMap(b => blockchain.getTotalDifficultyByHash(b.hash)) match {
         case Some(blockParentTd) =>
-          val (newBlocks, error) = processBlocks(blocks, blockParentTd)
+          val (newBlocks, errorOpt) = processBlocks(blocks, blockParentTd)
 
           if(newBlocks.nonEmpty){
             context.self ! BroadcastBlocks(newBlocks)
             log.info(s"got new blocks up till block: ${newBlocks.last.block.header.number} " +
               s"with hash ${Hex.toHexString(newBlocks.last.block.header.hash.toArray[Byte])}")
           }
 
-          if(error.isDefined){
-            val numberBlockFailed = blocks.head.header.number + newBlocks.length
-            resumeWithDifferentPeer(peer, reason = s"a block execution error: ${error.get.toString}, in block $numberBlockFailed")
-          } else {
-            headersQueue = headersQueue.drop(blocks.length)
-            if (headersQueue.nonEmpty) {
-              val hashes = headersQueue.take(blockBodiesPerRequest).map(_.hash)
-              waitingForActor = Some(context.actorOf(SyncBlockBodiesRequestHandler.props(peer, hashes)))
-            } else {
-              context.self ! ResumeRegularSync
-            }
+          errorOpt match {
+            case Some(error) =>
+              val numberBlockFailed = blocks.head.header.number + newBlocks.length
+              resumeWithDifferentPeer(peer, reason = s"a block execution error: ${error.toString}, in block $numberBlockFailed")
+            case None =>
+              headersQueue = headersQueue.drop(blocks.length)
+              if (headersQueue.nonEmpty) {
+                val hashes = headersQueue.take(blockBodiesPerRequest).map(_.hash)
+                waitingForActor = Some(context.actorOf(SyncBlockBodiesRequestHandler.props(peer, hashes)))
+              } else {
+                context.self ! ResumeRegularSync
+              }
           }
         case None =>
           //TODO: Investigate if we can recover from this error (EC-165)

src/main/scala/io/iohk/ethereum/validators/SignedTransactionValidator.scala

@@ -34,7 +34,7 @@ class SignedTransactionValidatorImpl(blockchainConfig: BlockchainConfig) extends
       _ <- validateSignature(stx, fromBeforeHomestead = blockHeader.number < blockchainConfig.homesteadBlockNumber)
       _ <- validateNonce(stx, senderAccount.nonce)
       _ <- validateGasLimitEnoughForIntrinsicGas(stx, blockHeader.number)
-      _ <- validateAccountHasEnoughGasToPayUpfrontCost(stx, senderAccount.balance, upfrontGasCost)
+      _ <- validateAccountHasEnoughGasToPayUpfrontCost(senderAccount.balance, upfrontGasCost)
       _ <- validateBlockHasEnoughGasLimitForTx(stx, accumGasUsed, blockHeader.gasLimit)
     } yield ()
   }
@@ -121,12 +121,11 @@ class SignedTransactionValidatorImpl(blockchainConfig: BlockchainConfig) extends
   /**
     * Validates the sender account balance contains at least the cost required in up-front payment.
     *
-    * @param stx Transaction to validate
     * @param senderBalance Balance of the sender of the tx
     * @param upfrontCost Upfront cost of the transaction tx
     * @return Either the validated transaction or a TransactionSenderCantPayUpfrontCostError
     */
-  private def validateAccountHasEnoughGasToPayUpfrontCost(stx: SignedTransaction, senderBalance: UInt256, upfrontCost: UInt256)
+  private def validateAccountHasEnoughGasToPayUpfrontCost(senderBalance: UInt256, upfrontCost: UInt256)
   : Either[SignedTransactionError, Unit] = {
     if (senderBalance >= upfrontCost) Right(())
     else Left(TransactionSenderCantPayUpfrontCostError(upfrontCost, senderBalance))