Revert "Skip mempool.dat when wallet is starting in "zap" mode (#2782)"

This reverts commit 60a91848a4.
This commit is contained in:
Pasta 2019-07-24 12:55:09 -05:00
parent 4a22fb78f9
commit f0c73f5cec
No known key found for this signature in database
GPG Key ID: D362C9F7142766AE

View File

@ -4358,11 +4358,6 @@ static const uint64_t MEMPOOL_DUMP_VERSION = 1;
bool LoadMempool(void) bool LoadMempool(void)
{ {
if (gArgs.GetBoolArg("-zapwallettxes", false)) {
LogPrintf("Skipping mempool.dat because of zapwallettxes\n");
return true;
}
const CChainParams& chainparams = Params(); const CChainParams& chainparams = Params();
int64_t nExpiryTimeout = gArgs.GetArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 * 60; int64_t nExpiryTimeout = gArgs.GetArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 * 60;
FILE* filestr = fsbridge::fopen(GetDataDir() / "mempool.dat", "rb"); FILE* filestr = fsbridge::fopen(GetDataDir() / "mempool.dat", "rb");