File tree 3 files changed +6
-7
lines changed
3 files changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -105,13 +105,12 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
105
105
std::vector<bool > have_txn (txn_available.size ());
106
106
{
107
107
LOCK (pool->cs );
108
- const std::vector<std::pair<uint256, CTxMemPool::txiter> >& vTxHashes = pool->vTxHashes ;
109
- for (size_t i = 0 ; i < vTxHashes.size (); i++) {
110
- uint64_t shortid = cmpctblock.GetShortID (vTxHashes[i].first );
108
+ for (size_t i = 0 ; i < pool->vTxHashes .size (); i++) {
109
+ uint64_t shortid = cmpctblock.GetShortID (pool->vTxHashes [i].first );
111
110
std::unordered_map<uint64_t , uint16_t >::iterator idit = shorttxids.find (shortid);
112
111
if (idit != shorttxids.end ()) {
113
112
if (!have_txn[idit->second ]) {
114
- txn_available[idit->second ] = vTxHashes[i].second ->GetSharedTx ();
113
+ txn_available[idit->second ] = pool-> vTxHashes [i].second ->GetSharedTx ();
115
114
have_txn[idit->second ] = true ;
116
115
mempool_count++;
117
116
} else {
Original file line number Diff line number Diff line change @@ -126,7 +126,7 @@ class PartiallyDownloadedBlock {
126
126
protected:
127
127
std::vector<CTransactionRef> txn_available;
128
128
size_t prefilled_count = 0 , mempool_count = 0 , extra_count = 0 ;
129
- CTxMemPool* pool;
129
+ const CTxMemPool* pool;
130
130
public:
131
131
CBlockHeader header;
132
132
explicit PartiallyDownloadedBlock (CTxMemPool* poolIn) : pool(poolIn) {}
Original file line number Diff line number Diff line change @@ -746,7 +746,7 @@ UniValue dumpwallet(const JSONRPCRequest& request)
746
746
// the user could have gotten from another RPC command prior to now
747
747
wallet.BlockUntilSyncedToCurrentChain ();
748
748
749
- LOCK2 (pwallet-> cs_wallet , spk_man.cs_KeyStore );
749
+ LOCK2 (wallet. cs_wallet , spk_man.cs_KeyStore );
750
750
751
751
EnsureWalletIsUnlocked (&wallet);
752
752
@@ -769,7 +769,7 @@ UniValue dumpwallet(const JSONRPCRequest& request)
769
769
770
770
std::map<CKeyID, int64_t > mapKeyBirth;
771
771
const std::map<CKeyID, int64_t >& mapKeyPool = spk_man.GetAllReserveKeys ();
772
- pwallet-> GetKeyBirthTimes (mapKeyBirth);
772
+ wallet. GetKeyBirthTimes (mapKeyBirth);
773
773
774
774
std::set<CScriptID> scripts = spk_man.GetCScripts ();
775
775
You can’t perform that action at this time.
0 commit comments