refactor: block import implies IsInitialBlockDownload

MarcoFalke · MarcoFalke · commit fa06d7e93489 · 2020-06-19T09:27:13.000-04:00
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -2576,7 +2576,7 @@ void ProcessMessage(
                     LogPrint(BCLog::NET, "transaction (%s) inv sent in violation of protocol, disconnecting peer=%d\n", inv.hash.ToString(), pfrom.GetId());
                     pfrom.fDisconnect = true;
                     return;
-                } else if (!fAlreadyHave && !fImporting && !fReindex && !::ChainstateActive().IsInitialBlockDownload()) {
+                } else if (!fAlreadyHave && !chainman.ActiveChainstate().IsInitialBlockDownload()) {
                     RequestTx(State(pfrom.GetId()), inv.hash, current_time);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -2576,7 +2576,7 @@ void ProcessMessage(`
`2576`	`2576`	`LogPrint(BCLog::NET, "transaction (%s) inv sent in violation of protocol, disconnecting peer=%d\n", inv.hash.ToString(), pfrom.GetId());`
`2577`	`2577`	`pfrom.fDisconnect = true;`
`2578`	`2578`	`return;`
`2579`		`- } else if (!fAlreadyHave && !fImporting && !fReindex && !::ChainstateActive().IsInitialBlockDownload()) {`
	`2579`	`+ } else if (!fAlreadyHave && !chainman.ActiveChainstate().IsInitialBlockDownload()) {`
`2580`	`2580`	`RequestTx(State(pfrom.GetId()), inv.hash, current_time);`
`2581`	`2581`	`}`
`2582`	`2582`	`}`