highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-05 17:30:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

[mempool] Remove error suppression on upgrade

Browse Source 
In 0.21, we added unbroadcast txids to mempool.dat. Commit 9c8a55d
added a try-block to prevent throwing a "failed to deserialize mempool data"
error when a user upgrades from 0.21 to 0.22. This exception handling is no
longer useful, so now we can remove it.
This commit is contained in:
Amiti Uttarwar 2021-01-04 12:02:29 -08:00
parent bc8ada1c15
commit 7ff05358a9
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/validation.cpp
View File

@ -5035,15 +5035,9 @@ bool LoadMempool(CTxMemPool& pool)
pool.PrioritiseTransaction(i.first, i.second); pool.PrioritiseTransaction(i.first, i.second);
} }
// TODO: remove this try except in v0.22
std::set<uint256> unbroadcast_txids; std::set<uint256> unbroadcast_txids;
try { file >> unbroadcast_txids;
file >> unbroadcast_txids; unbroadcast = unbroadcast_txids.size();
unbroadcast = unbroadcast_txids.size();
} catch (const std::exception&) {
// mempool.dat files created prior to v0.21 will not have an
// unbroadcast set. No need to log a failure if parsing fails here.
}
for (const auto& txid : unbroadcast_txids) { for (const auto& txid : unbroadcast_txids) {
// Ensure transactions were accepted to mempool then add to // Ensure transactions were accepted to mempool then add to
// unbroadcast set. // unbroadcast set.