highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-26 08:51:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

[validation] Remove pool member from ConnectTrace

Browse Source 
It's no longer used for anything.
This commit is contained in:
John Newbery 2019-11-15 15:33:27 -05:00
parent 969b65f3f5
commit 2dd561f361
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/validation.cpp
View File

@ -2517,10 +2517,9 @@ struct PerBlockConnectTrace {
class ConnectTrace { class ConnectTrace {
private: private:
std::vector<PerBlockConnectTrace> blocksConnected; std::vector<PerBlockConnectTrace> blocksConnected;
CTxMemPool &pool;
public: public:
explicit ConnectTrace(CTxMemPool &_pool) : blocksConnected(1), pool(_pool) {} explicit ConnectTrace() : blocksConnected(1) {}
void BlockConnected(CBlockIndex* pindex, std::shared_ptr<const CBlock> pblock) { void BlockConnected(CBlockIndex* pindex, std::shared_ptr<const CBlock> pblock) {
assert(!blocksConnected.back().pindex); assert(!blocksConnected.back().pindex);
@ -2833,7 +2832,7 @@ bool CChainState::ActivateBestChain(BlockValidationState &state, const CChainPar
do { do {
// We absolutely may not unlock cs_main until we've made forward progress // We absolutely may not unlock cs_main until we've made forward progress
// (with the exception of shutdown due to hardware issues, low disk space, etc). // (with the exception of shutdown due to hardware issues, low disk space, etc).
ConnectTrace connectTrace(mempool); // Destructed before cs_main is unlocked ConnectTrace connectTrace; // Destructed before cs_main is unlocked
if (pindexMostWork == nullptr) { if (pindexMostWork == nullptr) {
pindexMostWork = FindMostWorkChain(); pindexMostWork = FindMostWorkChain();