Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-11 17:55:53 +00:00
Code Issues Projects Releases Wiki Activity

Some block-tester refactors, and a new large-reorg test (1008 blks)

Browse Source
This commit is contained in:
Matt Corallo 2014-11-09 23:56:10 -08:00 committed by Mike Hearn
parent d78e9b053a
commit ef0ae01b75
3 changed files with 611 additions and 671 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/test/java/org/bitcoinj/core/AbstractFullPrunedBlockChainTest.java
View File

@ -74,9 +74,9 @@ public abstract class AbstractFullPrunedBlockChainTest
chain = new FullPrunedBlockChain(params, store); chain = new FullPrunedBlockChain(params, store);
for (Rule rule : blockList.list) { for (Rule rule : blockList.list) {
if (!(rule instanceof BlockAndValidity)) if (!(rule instanceof FullBlockTestGenerator.BlockAndValidity))
continue; continue;
BlockAndValidity block = (BlockAndValidity) rule; FullBlockTestGenerator.BlockAndValidity block = (FullBlockTestGenerator.BlockAndValidity) rule;
log.info("Testing rule " + block.ruleName + " with block hash " + block.block.getHash()); log.info("Testing rule " + block.ruleName + " with block hash " + block.block.getHash());
boolean threw = false; boolean threw = false;
try { try {

14
core/src/test/java/org/bitcoinj/core/BitcoindComparisonTool.java
View File

@ -60,8 +60,8 @@ public class BitcoindComparisonTool {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
BriefLogFormatter.init(); BriefLogFormatter.init();
System.out.println("USAGE: bitcoinjBlockStoreLocation runLargeReorgs(1/0) [port=18444]"); System.out.println("USAGE: bitcoinjBlockStoreLocation runExpensiveTests(1/0) [port=18444]");
boolean runLargeReorgs = args.length > 1 && Integer.parseInt(args[1]) == 1; boolean runExpensiveTests = args.length > 1 && Integer.parseInt(args[1]) == 1;
params = RegTestParams.get(); params = RegTestParams.get();
@ -69,7 +69,7 @@ public class BitcoindComparisonTool {
blockFile.deleteOnExit(); blockFile.deleteOnExit();
FullBlockTestGenerator generator = new FullBlockTestGenerator(params); FullBlockTestGenerator generator = new FullBlockTestGenerator(params);
final RuleList blockList = generator.getBlocksToTest(false, runLargeReorgs, blockFile); final RuleList blockList = generator.getBlocksToTest(true, runExpensiveTests, blockFile);
final Map<Sha256Hash, Block> preloadedBlocks = new HashMap<Sha256Hash, Block>(); final Map<Sha256Hash, Block> preloadedBlocks = new HashMap<Sha256Hash, Block>();
final Iterator<Block> blocks = new BlockFileLoader(params, Arrays.asList(blockFile)); final Iterator<Block> blocks = new BlockFileLoader(params, Arrays.asList(blockFile));
@ -220,10 +220,10 @@ public class BitcoindComparisonTool {
int rulesSinceFirstFail = 0; int rulesSinceFirstFail = 0;
for (Rule rule : blockList.list) { for (Rule rule : blockList.list) {
if (rule instanceof BlockAndValidity) { if (rule instanceof FullBlockTestGenerator.BlockAndValidity) {
BlockAndValidity block = (BlockAndValidity) rule; FullBlockTestGenerator.BlockAndValidity block = (FullBlockTestGenerator.BlockAndValidity) rule;
boolean threw = false; boolean threw = false;
Block nextBlock = preloadedBlocks.get(((BlockAndValidity) rule).blockHash); Block nextBlock = preloadedBlocks.get(((FullBlockTestGenerator.BlockAndValidity) rule).blockHash);
// Often load at least one block because sometimes we have duplicates with the same hash (b56/57) // Often load at least one block because sometimes we have duplicates with the same hash (b56/57)
for (int i = 0; i < 1 for (int i = 0; i < 1
|| nextBlock == null || !nextBlock.getHash().equals(block.blockHash); || nextBlock == null || !nextBlock.getHash().equals(block.blockHash);
@ -283,7 +283,7 @@ public class BitcoindComparisonTool {
} }
// bitcoind doesn't request blocks inline so we can't rely on a ping for synchronization // bitcoind doesn't request blocks inline so we can't rely on a ping for synchronization
for (int i = 0; !shouldntRequest && !blocksRequested.contains(nextBlock.getHash()); i++) { for (int i = 0; !shouldntRequest && !blocksRequested.contains(nextBlock.getHash()); i++) {
int SLEEP_TIME = 10; int SLEEP_TIME = 1;
if (i % 1000/SLEEP_TIME == 1000/SLEEP_TIME - 1) if (i % 1000/SLEEP_TIME == 1000/SLEEP_TIME - 1)
log.error("bitcoind still hasn't requested block " + block.ruleName + " with hash " + nextBlock.getHash()); log.error("bitcoind still hasn't requested block " + block.ruleName + " with hash " + nextBlock.getHash());
Thread.sleep(SLEEP_TIME); Thread.sleep(SLEEP_TIME);

1264
core/src/test/java/org/bitcoinj/core/FullBlockTestGenerator.java
View File

File diff suppressed because it is too large Load Diff