diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2020-05-24 10:34:52 -0700 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2020-05-24 10:34:52 -0700 |
commit | ef17c03e074b6c3f185afa4eff572ba687c2a171 (patch) | |
tree | 0cdd2ce4516205a4c80c5d4400ad75af68de3e6c /src/wallet/crypter.h | |
parent | 65c589e45e8b8914698a0fd25cd5aafdda30869c (diff) |
Convert wallet to new serialization
Diffstat (limited to 'src/wallet/crypter.h')
-rw-r--r-- | src/wallet/crypter.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h index f59c63260e..f2df786e2e 100644 --- a/src/wallet/crypter.h +++ b/src/wallet/crypter.h @@ -43,15 +43,9 @@ public: //! such as the various parameters to scrypt std::vector<unsigned char> vchOtherDerivationParameters; - ADD_SERIALIZE_METHODS; - - template <typename Stream, typename Operation> - inline void SerializationOp(Stream& s, Operation ser_action) { - READWRITE(vchCryptedKey); - READWRITE(vchSalt); - READWRITE(nDerivationMethod); - READWRITE(nDeriveIterations); - READWRITE(vchOtherDerivationParameters); + SERIALIZE_METHODS(CMasterKey, obj) + { + READWRITE(obj.vchCryptedKey, obj.vchSalt, obj.nDerivationMethod, obj.nDeriveIterations, obj.vchOtherDerivationParameters); } CMasterKey() |