Cleanup

Author: Łukasz Gąsior

src/main/scala/io/iohk/ethereum/consensus/ConsensusBuilder.scala

@@ -48,8 +48,7 @@ trait StdConsensusBuilder extends ConsensusBuilder {
         case Protocol.Ethash ⇒ buildEthashConsensus()
         case Protocol.AtomixRaft ⇒ buildAtomixRaftConsensus()
       }
-    // TODO: why the fuck does it fail with npe?
-//    log.info(s"Using '${protocol.name}' consensus [${consensus.getClass.getName}]")
+    log.info(s"Using '${protocol.name}' consensus [${consensus.getClass.getName}]")
 
     consensus
   }

src/main/scala/io/iohk/ethereum/consensus/ethash/EthashConsensus.scala

@@ -9,14 +9,13 @@ import io.iohk.ethereum.consensus.blocks.TestBlockGenerator
 import io.iohk.ethereum.consensus.ethash.EthashMiner.MinerMsg
 import io.iohk.ethereum.consensus.ethash.blocks.{EthashBlockGenerator, EthashBlockGeneratorImpl}
 import io.iohk.ethereum.consensus.ethash.validators.{EthashValidators, StdEthashValidators}
-import io.iohk.ethereum.consensus.validators._
+import io.iohk.ethereum.consensus.validators.Validators
 import io.iohk.ethereum.domain.BlockchainImpl
 import io.iohk.ethereum.ledger.BlockPreparator
 import io.iohk.ethereum.ledger.Ledger.VMImpl
 import io.iohk.ethereum.nodebuilder.Node
 import io.iohk.ethereum.utils.{BlockchainConfig, Logger}
 
-
 /**
  * Implements standard Ethereum consensus (ethash PoW).
  */

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

@@ -99,10 +99,7 @@ trait JsonMethodsImplicits {
 
       to <- input.get("to") match {
         case Some(JString(s)) =>
-          extractAddress(s).map {
-            case addr if addr.toUInt256.isZero => None
-            case addr => Some(addr)
-          }
+          extractAddress(s).map(Some(_))
 
         case Some(_) => Left(InvalidAddress)
         case None => Right(None)

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

@@ -20,7 +20,7 @@ case class TransactionRequest(
       nonce = nonce.getOrElse(defaultNonce),
       gasPrice = gasPrice.getOrElse(defaultGasPrice),
       gasLimit = gasLimit.getOrElse(defaultGasLimit),
-      receivingAddress = to,
+      receivingAddress = if (to.contains(Address(0))) None else to,
       value = value.getOrElse(BigInt(0)),
       payload = data.getOrElse(ByteString.empty)
     )