diff options
| author | Patrick Strateman <patrick.strateman@gmail.com> | 2016-08-01 17:14:40 -0700 |
|---|---|---|
| committer | Patrick Strateman <patrick.strateman@gmail.com> | 2016-08-17 15:24:57 -0700 |
| commit | e86eb71604e73ad35b8b1f59d73af22e353a156e (patch) | |
| tree | 1e2c5327c62ef7ab427e46aa2a307f2ce6d77b58 /src/wallet/walletdb.cpp | |
| parent | ea268747b6d417a406977e9b4931badce29b9d7a (diff) | |
| download | bitcoin-e86eb71604e73ad35b8b1f59d73af22e353a156e.tar.xz | |
Move CWallet::setKeyPool to private section of CWallet
Diffstat (limited to 'src/wallet/walletdb.cpp')
| -rw-r--r-- | src/wallet/walletdb.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 543522ca64..025d3606d9 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -556,14 +556,8 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, ssKey >> nIndex; CKeyPool keypool; ssValue >> keypool; - pwallet->setKeyPool.insert(nIndex); - - // If no metadata exists yet, create a default with the pool key's - // creation time. Note that this may be overwritten by actually - // stored metadata for that key later, which is fine. - CKeyID keyid = keypool.vchPubKey.GetID(); - if (pwallet->mapKeyMetadata.count(keyid) == 0) - pwallet->mapKeyMetadata[keyid] = CKeyMetadata(keypool.nTime); + + pwallet->LoadKeyPool(nIndex, keypool); } else if (strType == "version") { |