Merge branch 'eip-669' into eip-658

ethereum · Aug 30, 2017 · d95fb25 · d95fb25
2 parents 748ad40 + 468fde0
commit d95fb25
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/ethereumj-core/src/main/java/org/ethereum/core/BlockchainImpl.java b/ethereumj-core/src/main/java/org/ethereum/core/BlockchainImpl.java
@@ -224,8 +224,6 @@ public BlockchainImpl withParentBlockHeaderValidator(ParentBlockHeaderValidator
     private void initConst(SystemProperties config) {
         minerCoinbase = config.getMinerCoinbase();
         minerExtraData = config.getMineExtraData();
-//        BLOCK_REWARD = config.getBlockchainConfig().getCommonConstants().getBLOCK_REWARD();
-//        INCLUSION_REWARD = BLOCK_REWARD.divide(BigInteger.valueOf(32));
         UNCLE_LIST_LIMIT = config.getBlockchainConfig().getCommonConstants().getUNCLE_LIST_LIMIT();
         UNCLE_GENERATION_LIMIT = config.getBlockchainConfig().getCommonConstants().getUNCLE_GENERATION_LIMIT();
     }