X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fwalletdb.cpp;h=0f39cdf3fbafafab1b174a5e1c5132608d88e41d;hp=ab85b072cfc680619ca5f05be15c5c1c5fcd4968;hb=9a848e2cae1fc51c8b76a5d76a69d8fe2d87e078;hpb=9e58e0a8ca28b15a4bfa677f5b23891972db40fd diff --git a/src/walletdb.cpp b/src/walletdb.cpp index ab85b07..0f39cdf 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -352,9 +352,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, strErr = "Error reading wallet database: CPrivKey pubkey inconsistency"; return false; } - if (vchPubKey.size() == 33) { - key.SetCompressedPubKey(); - } + key.SetCompressedPubKey(vchPubKey.IsCompressed()); if (!key.IsValid()) { strErr = "Error reading wallet database: invalid CPrivKey"; @@ -375,9 +373,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, strErr = "Error reading wallet database: CWalletKey pubkey inconsistency"; return false; } - if (vchPubKey.size() == 33) { - key.SetCompressedPubKey(); - } + key.SetCompressedPubKey(vchPubKey.IsCompressed()); if (!key.IsValid()) { strErr = "Error reading wallet database: invalid CWalletKey"; @@ -654,7 +650,7 @@ DBErrors CWalletDB::FindWalletTx(CWallet* pwallet, vector& vTxHash) } pcursor->close(); } - catch (boost::thread_interrupted) { + catch (const boost::thread_interrupted&) { throw; } catch (...) {