[ETCM-17] Fix typo. Improve validity check

Author: KonradStaniec

src/main/scala/io/iohk/ethereum/vm/Blake2bCompression.scala

@@ -34,13 +34,8 @@ object Blake2bCompression {
 
   private def bytesToLong(bytes: Array[Byte]) = Pack.littleEndianToLong(bytes, 0)
 
-  def isValidInput(input: Array[Byte]): Boolean= {
-    if (input.length != MessageBytesLength || (input(212) & 0xFE) != 0) {
-      false
-    } else {
-      true
-    }
-  }
+  def isValidInput(input: Array[Byte]): Boolean =
+    !(input.length != MessageBytesLength || (input(212) & 0xFE) != 0)
 
   def parseNumberOfRounds(input: Array[Byte]): Long =
     Integer.toUnsignedLong(bytesToInt(copyOfRange(input, 0, 4)))

src/main/scala/io/iohk/ethereum/vm/PrecompiledContracts.scala

@@ -40,7 +40,7 @@ object PrecompiledContracts {
     Bn128PairingAddr -> Bn128Pairing
   )
 
-  val istanbulPhoenisContracts = byzantiumAtlantisContracts ++ Map(
+  val istanbulPhoenixContracts = byzantiumAtlantisContracts ++ Map(
     Blake2bCompressionAddr -> Blake2bCompress
   )
   /**
@@ -63,7 +63,7 @@ object PrecompiledContracts {
       val etcFork = context.evmConfig.blockchainConfig.etcForkForBlockNumber(context.blockHeader.number)
 
       if (ethFork >= EthForks.Istanbul || etcFork >= EtcForks.Phoenix) {
-        istanbulPhoenisContracts.get(addr)
+        istanbulPhoenixContracts.get(addr)
       } else if (ethFork >= EthForks.Byzantium || etcFork >= EtcForks.Atlantis) {
         // byzantium and atlantis hard fork introduce the same set of precompiled contracts
         byzantiumAtlantisContracts.get(addr)