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

[mempool] Don't throw expected error message when upgrading

Browse Source
This commit is contained in:
Amiti Uttarwar 2020-04-28 10:42:01 -07:00
parent ba54983182
commit 9c8a55d9cb
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/validation.cpp
View File

@ -5067,6 +5067,8 @@ bool LoadMempool(CTxMemPool& pool)
pool.PrioritiseTransaction(i.first, i.second); pool.PrioritiseTransaction(i.first, i.second);
} }
// TODO: remove this try except in v0.22
try {
std::set<uint256> unbroadcast_txids; std::set<uint256> unbroadcast_txids;
file >> unbroadcast_txids; file >> unbroadcast_txids;
unbroadcast = unbroadcast_txids.size(); unbroadcast = unbroadcast_txids.size();
@ -5074,6 +5076,10 @@ bool LoadMempool(CTxMemPool& pool)
for (const auto& txid : unbroadcast_txids) { for (const auto& txid : unbroadcast_txids) {
pool.AddUnbroadcastTx(txid); pool.AddUnbroadcastTx(txid);
} }
} 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.
}
} catch (const std::exception& e) { } catch (const std::exception& e) {
LogPrintf("Failed to deserialize mempool data on disk: %s. Continuing anyway.\n", e.what()); LogPrintf("Failed to deserialize mempool data on disk: %s. Continuing anyway.\n", e.what());