aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet.h
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2019-08-01 11:54:06 +0800
committerfanquake <fanquake@gmail.com>2019-08-01 12:13:33 +0800
commitb7fbf74b980ebb122ae34b142f2cc49b44b92de3 (patch)
tree3c47de3c56e88f30f1b7d44ad295ff7ac8559d90 /src/wallet/wallet.h
parent25f0edd59fee454495da39c6c63f19b97cd75e96 (diff)
parent0b1f4b3c6685d0a6307926d43d166add538061b7 (diff)
Merge #16502: wallet: Drop unused OldKey
0b1f4b3c6685d0a6307926d43d166add538061b7 wallet: Drop unused OldKey (João Barbosa) Pull request description: Replaces #16494, `OldKey` (previously `CWalletKey`) was never serialized in the code history which means that unserialization support is not required, so remove the code entirely. ACKs for top commit: jnewbery: ACK 0b1f4b3c6685d0a6307926d43d166add538061b7 laanwj: ACK 0b1f4b3c6685d0a6307926d43d166add538061b7 fanquake: ACK 0b1f4b3c6685d0a6307926d43d166add538061b7 Tree-SHA512: 92e9b2d6fc41f2765492d5d69d18fc4302c40ab44f28c8c30ca652c72767fbc484848c51a38ecf1f447849767a583c398784408bb5f64f9c86f9a5872b325ffc
Diffstat (limited to 'src/wallet/wallet.h')
-rw-r--r--src/wallet/wallet.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 86c2cf851c..8b0ae8bb85 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -663,28 +663,6 @@ public:
}
};
-/** Private key that was serialized by an old wallet (only used for deserialization) */
-struct OldKey {
- CPrivKey vchPrivKey;
- ADD_SERIALIZE_METHODS;
-
- template <typename Stream, typename Operation>
- inline void SerializationOp(Stream& s, Operation ser_action) {
- // no longer used by the wallet, thus dropped after deserialization:
- int64_t nTimeCreated;
- int64_t nTimeExpires;
- std::string strComment;
-
- int nVersion = s.GetVersion();
- if (!(s.GetType() & SER_GETHASH))
- READWRITE(nVersion);
- READWRITE(vchPrivKey);
- READWRITE(nTimeCreated);
- READWRITE(nTimeExpires);
- READWRITE(LIMITED_STRING(strComment, 65536));
- }
-};
-
struct CoinSelectionParams
{
bool use_bnb = true;