diff --git a/ethereumj-core/src/main/java/org/ethereum/core/Block.java b/ethereumj-core/src/main/java/org/ethereum/core/Block.java index e0e71b2d..ed09578d 100644 --- a/ethereumj-core/src/main/java/org/ethereum/core/Block.java +++ b/ethereumj-core/src/main/java/org/ethereum/core/Block.java @@ -36,7 +36,7 @@ public class Block { /* A scalar value equal to the mininum limit of gas expenditure per block */ private static long MIN_GAS_LIMIT = 125000L; - public static BigInteger coinbaseReward = BigInteger.valueOf(1500000000000000000L); + public static BigInteger BLOCK_REWARD = BigInteger.valueOf(1500000000000000000L); private BlockHeader header; diff --git a/ethereumj-core/src/main/java/org/ethereum/manager/WorldManager.java b/ethereumj-core/src/main/java/org/ethereum/manager/WorldManager.java index 740929af..031e019f 100644 --- a/ethereumj-core/src/main/java/org/ethereum/manager/WorldManager.java +++ b/ethereumj-core/src/main/java/org/ethereum/manager/WorldManager.java @@ -26,14 +26,12 @@ import org.slf4j.LoggerFactory; import org.spongycastle.util.encoders.Hex; /** - * * WorldManager is the main class to handle the processing of transactions and * managing the world state. * * www.ethereumJ.com - * - * @author: Roman Mandeleil Created on: 01/06/2014 10:44 - * + * @author: Roman Mandeleil + * Created on: 01/06/2014 10:44 */ public class WorldManager { @@ -177,8 +175,7 @@ public class WorldManager { if (tx.getValue() != null) { BigInteger senderBalance = repository.getBalance(senderAddress); - BigInteger contractBalance = repository - .getBalance(contractAddress); + BigInteger contractBalance = repository.getBalance(contractAddress); if (senderBalance.compareTo(new BigInteger(1, tx.getValue())) >= 0) { @@ -307,7 +304,7 @@ public class WorldManager { // miner reward if (repository.getAccountState(block.getCoinbase()) == null) repository.createAccount(block.getCoinbase()); - repository.addBalance(block.getCoinbase(), Block.coinbaseReward); + repository.addBalance(block.getCoinbase(), Block.BLOCK_REWARD); int i = 0; List txList = block.getTransactionsList(); diff --git a/ethereumj-core/src/test/java/org/ethereum/core/WalletTest.java b/ethereumj-core/src/test/java/org/ethereum/core/WalletTest.java index a25e911e..d01f9235 100644 --- a/ethereumj-core/src/test/java/org/ethereum/core/WalletTest.java +++ b/ethereumj-core/src/test/java/org/ethereum/core/WalletTest.java @@ -2,6 +2,7 @@ package org.ethereum.core; import org.ethereum.crypto.ECKey; import org.ethereum.crypto.HashUtil; +import org.junit.Ignore; import org.junit.Test; import org.xml.sax.SAXException; @@ -19,7 +20,7 @@ import java.math.BigInteger; public class WalletTest { @Test - public void SaveTest1() throws TransformerException, ParserConfigurationException { + public void testSave1() throws TransformerException, ParserConfigurationException { Wallet wallet = new Wallet(); ECKey cowKey = ECKey.fromPrivate(HashUtil.sha3("cow".getBytes())); @@ -41,11 +42,11 @@ public class WalletTest { } @Test - public void LoadTest1() throws TransformerException, + @Ignore + public void testLoad1() throws TransformerException, ParserConfigurationException, IOException, SAXException { Wallet wallet = new Wallet(); wallet.load(); - System.out.println(); } } diff --git a/ethereumj-core/src/test/java/org/ethereum/trie/MockDB.java b/ethereumj-core/src/test/java/org/ethereum/trie/MockDB.java index 4933af27..38b5b2c5 100644 --- a/ethereumj-core/src/test/java/org/ethereum/trie/MockDB.java +++ b/ethereumj-core/src/test/java/org/ethereum/trie/MockDB.java @@ -127,18 +127,5 @@ public class MockDB implements DB { */ public int getAddedItems() { return addedItems; - } - -// @Override -// public void forEach(Consumer> action) { -// TODO Auto-generated method stub -// -// } - -// @Override -// public Spliterator> spliterator() { -// TODO Auto-generated method stub -// return null; -// } - + } } \ No newline at end of file