Fix some minor compact block issues that came up in review

TheBlueMatt · TheBlueMatt · commit 48efec82f3a1 · 2016-06-21T16:09:46.000-07:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -4613,7 +4613,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
             // Track requests for our stuff.
             GetMainSignals().Inventory(inv.hash);
 
-            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK)
+            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK || inv.type == MSG_CMPCT_BLOCK)
                 break;
         }
     }
@@ -5077,8 +5077,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
-        if (it->second->nHeight < chainActive.Height() - 10) {
-            LogPrint("net", "Peer %d sent us a getblocktxn for a block > 10 deep", pfrom->id);
+        if (it->second->nHeight < chainActive.Height() - 15) {
+            LogPrint("net", "Peer %d sent us a getblocktxn for a block > 15 deep", pfrom->id);
             return true;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -4613,7 +4613,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam`
`4613`	`4613`	`// Track requests for our stuff.`
`4614`	`4614`	`GetMainSignals().Inventory(inv.hash);`
`4615`	`4615`
`4616`		`- if (inv.type == MSG_BLOCK \|\| inv.type == MSG_FILTERED_BLOCK)`
	`4616`	`+ if (inv.type == MSG_BLOCK \|\| inv.type == MSG_FILTERED_BLOCK \|\| inv.type == MSG_CMPCT_BLOCK)`
`4617`	`4617`	`break;`
`4618`	`4618`	`}`
`4619`	`4619`	`}`
`@@ -5077,8 +5077,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,`
`5077`	`5077`	`return true;`
`5078`	`5078`	`}`
`5079`	`5079`
`5080`		`- if (it->second->nHeight < chainActive.Height() - 10) {`
`5081`		`- LogPrint("net", "Peer %d sent us a getblocktxn for a block > 10 deep", pfrom->id);`
	`5080`	`+ if (it->second->nHeight < chainActive.Height() - 15) {`
	`5081`	`+ LogPrint("net", "Peer %d sent us a getblocktxn for a block > 15 deep", pfrom->id);`
`5082`	`5082`	`return true;`
`5083`	`5083`	`}`
`5084`	`5084`