Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-12 10:15:52 +00:00
Code Issues Projects Releases Wiki Activity

A few simplifications suggested by IntelliJ

Browse Source
This commit is contained in:
Mike Hearn 2013-05-06 16:21:32 +02:00
parent c64453f835
commit 9a20c39b15
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
core/src/test/java/com/google/bitcoin/core/BlockChainTest.java
View File

@ -129,7 +129,7 @@ public class BlockChainTest {
Transaction tx2 = createFakeTx(unitTestParams, Utils.toNanoCoins(1, 0), Transaction tx2 = createFakeTx(unitTestParams, Utils.toNanoCoins(1, 0),
new ECKey().toAddress(unitTestParams)); new ECKey().toAddress(unitTestParams));
Block b2 = createFakeBlock(blockStore, tx2).block; Block b2 = createFakeBlock(blockStore, tx2).block;
hash = b2.getMerkleRoot(); b2.getMerkleRoot();
b2.setMerkleRoot(Sha256Hash.ZERO_HASH); b2.setMerkleRoot(Sha256Hash.ZERO_HASH);
b2.solve(); b2.solve();
chain.add(b2); // Broken block is accepted because its contents don't matter to us. chain.add(b2); // Broken block is accepted because its contents don't matter to us.
@ -200,7 +200,7 @@ public class BlockChainTest {
// allowable difficulty. // allowable difficulty.
fail(); fail();
} catch (VerificationException e) { } catch (VerificationException e) {
assertTrue(e.getMessage(), e.getCause().getMessage().indexOf("Difficulty target is bad") >= 0); assertTrue(e.getMessage(), e.getCause().getMessage().contains("Difficulty target is bad"));
} }
// Accept any level of difficulty now. // Accept any level of difficulty now.
@ -212,7 +212,7 @@ public class BlockChainTest {
// We should not get here as the difficulty target should not be changing at this point. // We should not get here as the difficulty target should not be changing at this point.
fail(); fail();
} catch (VerificationException e) { } catch (VerificationException e) {
assertTrue(e.getMessage(), e.getCause().getMessage().indexOf("Unexpected change in difficulty") >= 0); assertTrue(e.getMessage(), e.getCause().getMessage().contains("Unexpected change in difficulty"));
} }
testNet.proofOfWorkLimit = oldVal; testNet.proofOfWorkLimit = oldVal;
@ -279,8 +279,8 @@ public class BlockChainTest {
assertNotNull(coinbaseTransaction); assertNotNull(coinbaseTransaction);
// The coinbase tx is not yet available to spend. // The coinbase tx is not yet available to spend.
assertTrue(wallet.getBalance().equals(BigInteger.ZERO)); assertEquals(BigInteger.ZERO, wallet.getBalance());
assertTrue(wallet.getBalance(BalanceType.ESTIMATED).equals(Utils.toNanoCoins(50, 0))); assertEquals(wallet.getBalance(BalanceType.ESTIMATED), Utils.toNanoCoins(50, 0));
assertTrue(!coinbaseTransaction.isMature()); assertTrue(!coinbaseTransaction.isMature());
// Attempt to spend the coinbase - this should fail as the coinbase is not mature yet. // Attempt to spend the coinbase - this should fail as the coinbase is not mature yet.
@ -297,8 +297,8 @@ public class BlockChainTest {
chain.add(b2); chain.add(b2);
// Wallet still does not have the coinbase transaction available for spend. // Wallet still does not have the coinbase transaction available for spend.
assertTrue(wallet.getBalance().equals(BigInteger.ZERO)); assertEquals(BigInteger.ZERO, wallet.getBalance());
assertTrue(wallet.getBalance(BalanceType.ESTIMATED).equals(Utils.toNanoCoins(50, 0))); assertEquals(wallet.getBalance(BalanceType.ESTIMATED), Utils.toNanoCoins(50, 0));
// The coinbase transaction is still not mature. // The coinbase transaction is still not mature.
assertTrue(!coinbaseTransaction.isMature()); assertTrue(!coinbaseTransaction.isMature());
@ -317,32 +317,32 @@ public class BlockChainTest {
chain.add(b3); chain.add(b3);
// Wallet now has the coinbase transaction available for spend. // Wallet now has the coinbase transaction available for spend.
assertTrue(wallet.getBalance().equals( Utils.toNanoCoins(50, 0))); assertEquals(wallet.getBalance(), Utils.toNanoCoins(50, 0));
assertTrue(wallet.getBalance(BalanceType.ESTIMATED).equals(Utils.toNanoCoins(50, 0))); assertEquals(wallet.getBalance(BalanceType.ESTIMATED), Utils.toNanoCoins(50, 0));
assertTrue(coinbaseTransaction.isMature()); assertTrue(coinbaseTransaction.isMature());
// Create a spend with the coinbase BTC to the address in the second wallet - this should now succeed. // Create a spend with the coinbase BTC to the address in the second wallet - this should now succeed.
coinbaseSpend = wallet.createSend(addressToSendTo, Utils.toNanoCoins(49, 0)); Transaction coinbaseSend2 = wallet.createSend(addressToSendTo, Utils.toNanoCoins(49, 0));
assertNotNull(coinbaseSpend); assertNotNull(coinbaseSend2);
// Commit the coinbaseSpend to the first wallet and check the balances decrement. // Commit the coinbaseSpend to the first wallet and check the balances decrement.
wallet.commitTx(coinbaseSpend); wallet.commitTx(coinbaseSend2);
assertTrue(wallet.getBalance(BalanceType.ESTIMATED).equals( Utils.toNanoCoins(1, 0))); assertEquals(wallet.getBalance(BalanceType.ESTIMATED), Utils.toNanoCoins(1, 0));
// Available balance is zero as change has not been received from a block yet. // Available balance is zero as change has not been received from a block yet.
assertTrue(wallet.getBalance(BalanceType.AVAILABLE).equals( Utils.toNanoCoins(0, 0))); assertEquals(wallet.getBalance(BalanceType.AVAILABLE), Utils.toNanoCoins(0, 0));
// Give it one more block - change from coinbaseSpend should now be available in the first wallet. // Give it one more block - change from coinbaseSpend should now be available in the first wallet.
Block b4 = createFakeBlock(blockStore, coinbaseSpend).block; Block b4 = createFakeBlock(blockStore, coinbaseSend2).block;
chain.add(b4); chain.add(b4);
assertTrue(wallet.getBalance(BalanceType.AVAILABLE).equals(Utils.toNanoCoins(1, 0))); assertEquals(wallet.getBalance(BalanceType.AVAILABLE), Utils.toNanoCoins(1, 0));
// Check the balances in the second wallet. // Check the balances in the second wallet.
assertTrue(wallet2.getBalance(BalanceType.ESTIMATED).equals( Utils.toNanoCoins(49, 0))); assertEquals(wallet2.getBalance(BalanceType.ESTIMATED), Utils.toNanoCoins(49, 0));
assertTrue(wallet2.getBalance(BalanceType.AVAILABLE).equals( Utils.toNanoCoins(49, 0))); assertEquals(wallet2.getBalance(BalanceType.AVAILABLE), Utils.toNanoCoins(49, 0));
} }
// Some blocks from the test net. // Some blocks from the test net.
private Block getBlock2() throws Exception { private static Block getBlock2() throws Exception {
Block b2 = new Block(testNet); Block b2 = new Block(testNet);
b2.setMerkleRoot(new Sha256Hash("addc858a17e21e68350f968ccd384d6439b64aafa6c193c8b9dd66320470838b")); b2.setMerkleRoot(new Sha256Hash("addc858a17e21e68350f968ccd384d6439b64aafa6c193c8b9dd66320470838b"));
b2.setNonce(2642058077L); b2.setNonce(2642058077L);
@ -353,7 +353,7 @@ public class BlockChainTest {
return b2; return b2;
} }
private Block getBlock1() throws Exception { private static Block getBlock1() throws Exception {
Block b1 = new Block(testNet); Block b1 = new Block(testNet);
b1.setMerkleRoot(new Sha256Hash("0e8e58ecdacaa7b3c6304a35ae4ffff964816d2b80b62b58558866ce4e648c10")); b1.setMerkleRoot(new Sha256Hash("0e8e58ecdacaa7b3c6304a35ae4ffff964816d2b80b62b58558866ce4e648c10"));
b1.setNonce(236038445); b1.setNonce(236038445);