refactor: drop usage of chainstate globals in spork logic

kwvg · kwvg · commit 0f4184cd7050 · 2024-06-26T13:50:49.000Z
diff --git a/src/spork.cpp b/src/spork.cpp
@@ -149,8 +149,7 @@ PeerMsgRet CSporkManager::ProcessSpork(const CNode& peer, PeerManager& peerman,
     {
         LOCK(cs_main);
         EraseObjectRequest(peer.GetId(), CInv(MSG_SPORK, hash));
-        if (!::ChainActive().Tip()) return {};
-        strLogMsg = strprintf("SPORK -- hash: %s id: %d value: %10d bestHeight: %d peer=%d", hash.ToString(), spork.nSporkID, spork.nValue, ::ChainActive().Height(), peer.GetId());
+        strLogMsg = strprintf("SPORK -- hash: %s id: %d value: %10d peer=%d", hash.ToString(), spork.nSporkID, spork.nValue, peer.GetId());
     }
 
     if (spork.nTimeSigned > GetAdjustedTime() + 2 * 60 * 60) {

Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,7 @@ PeerMsgRet CSporkManager::ProcessSpork(const CNode& peer, PeerManager& peerman,`
`149`	`149`	`{`
`150`	`150`	`LOCK(cs_main);`
`151`	`151`	`EraseObjectRequest(peer.GetId(), CInv(MSG_SPORK, hash));`
`152`		`- if (!::ChainActive().Tip()) return {};`
`153`		`- strLogMsg = strprintf("SPORK -- hash: %s id: %d value: %10d bestHeight: %d peer=%d", hash.ToString(), spork.nSporkID, spork.nValue, ::ChainActive().Height(), peer.GetId());`
	`152`	`+ strLogMsg = strprintf("SPORK -- hash: %s id: %d value: %10d peer=%d", hash.ToString(), spork.nSporkID, spork.nValue, peer.GetId());`
`154`	`153`	`}`
`155`	`154`
`156`	`155`	`if (spork.nTimeSigned > GetAdjustedTime() + 2 * 60 * 60) {`