From 4247bc75f640b3160bb658dd0eafc4845490b794 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 3 Sep 2013 18:34:16 -0400
Subject: [PATCH] Help BitcoindComparisonTool work with getheaders requirements

---
 .../bitcoinj/core/BitcoindComparisonTool.java    | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/core/src/test/java/org/bitcoinj/core/BitcoindComparisonTool.java b/core/src/test/java/org/bitcoinj/core/BitcoindComparisonTool.java
index 59f3a2330..6761e028a 100644
--- a/core/src/test/java/org/bitcoinj/core/BitcoindComparisonTool.java
+++ b/core/src/test/java/org/bitcoinj/core/BitcoindComparisonTool.java
@@ -31,7 +31,6 @@ import java.io.File;
 import java.net.InetAddress;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.Lock;
 
 /**
  * A tool for comparing the blocks which are accepted/rejected by bitcoind/bitcoinj
@@ -49,6 +48,10 @@ public class BitcoindComparisonTool {
     private static volatile Peer bitcoind;
     private static volatile InventoryMessage mostRecentInv = null;
 
+    static class BlockWrapper {
+        public Block block;
+    }
+
     public static void main(String[] args) throws Exception {
         BriefLogFormatter.init();
         System.out.println("USAGE: bitcoinjBlockStoreLocation runLargeReorgs(1/0) [port=18444]");
@@ -79,6 +82,8 @@ public class BitcoindComparisonTool {
         // bitcoind MUST be on localhost or we will get banned as a DoSer
         peers.addAddress(new PeerAddress(InetAddress.getByName("localhost"), args.length > 2 ? Integer.parseInt(args[2]) : params.getPort()));
 
+        final BlockWrapper currentBlock = new BlockWrapper();
+
         final Set<Sha256Hash> blocksRequested = Collections.synchronizedSet(new HashSet<Sha256Hash>());
         final AtomicInteger unexpectedInvs = new AtomicInteger(0);
         peers.addEventListener(new AbstractPeerEventListener() {
@@ -110,6 +115,13 @@ public class BitcoindComparisonTool {
                         if (item.type == InventoryItem.Type.Block)
                             blocksRequested.add(item.hash);
                     return null;
+                } else if (m instanceof GetHeadersMessage) {
+                    try {
+                        bitcoind.sendMessage(new HeadersMessage(params, currentBlock.block.cloneAsHeader()));
+                    } catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                    return null;
                 } else if (m instanceof InventoryMessage) {
                     if (mostRecentInv != null) {
                         log.error("Got an inv when we weren't expecting one");
@@ -172,6 +184,8 @@ public class BitcoindComparisonTool {
                 BlockAndValidity block = (BlockAndValidity) rule;
                 boolean threw = false;
                 Block nextBlock = blocks.next();
+                currentBlock.block = nextBlock;
+                log.info("Testing block {}", currentBlock.block.getHash());
                 try {
                     if (chain.add(nextBlock) != block.connects) {
                         log.error("Block didn't match connects flag on block \"" + block.ruleName + "\"");