diff options
| author | fanquake <fanquake@gmail.com> | 2019-07-30 11:19:44 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2019-07-30 11:37:01 +0800 |
| commit | 478fe328a793c9100c805dd45778ba624c303406 (patch) | |
| tree | 28b053a037eb6cc400590b424c1d08ed9e557557 /src/wallet/wallet.cpp | |
| parent | 2410088003a105947842cb7b4f57e33482902edf (diff) | |
| parent | fa6f22bf44c0f741285f27f27ac18e9679802e5e (diff) | |
| download | bitcoin-478fe328a793c9100c805dd45778ba624c303406.tar.xz | |
Merge #16475: wallet: Enumerate walletdb keys
fa6f22bf44c0f741285f27f27ac18e9679802e5e wallet: Rename CWalletKey to OldKey (MarcoFalke)
fa6dc7fa5fdfd76c6dd5f7ae693a2fb4e37e271f wallet: Enumerate walletdb keys (MarcoFalke)
Pull request description:
It is nice to see all the keys that exists in a single enum
Also, rename CWalletKey to OldKey and update the outdated documentation
ACKs for top commit:
laanwj:
ACK fa6f22bf44c0f741285f27f27ac18e9679802e5e, I'm a big fan of this kind of change as it prevents typos, which can happen with 'magic' strings in the code.
promag:
ACK fa6f22bf44c0f741285f27f27ac18e9679802e5e. @jnewbery suggestions are great followups, I think this is good enough.
meshcollider:
utACK fa6f22bf44c0f741285f27f27ac18e9679802e5e
achow101:
Code review ACK fa6f22bf44c0f741285f27f27ac18e9679802e5e
fanquake:
ACK fa6f22bf44c0f741285f27f27ac18e9679802e5e - I had a quick look over, definitely prefer this to strings floating around everywhere.
Tree-SHA512: 8ac3abd5a0d22dac1d77b8f97fe1e16c2608d650f3e9d6dd1df2fd5aeb35ef6643dfd4cd5c162404bb0100343c927d66df04dc695507ffc84a6c667e603acc54
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 18915aad54..638ed569c3 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4627,12 +4627,6 @@ CKeyPool::CKeyPool(const CPubKey& vchPubKeyIn, bool internalIn) m_pre_split = false; } -CWalletKey::CWalletKey(int64_t nExpires) -{ - nTimeCreated = (nExpires ? GetTime() : 0); - nTimeExpires = nExpires; -} - void CMerkleTx::SetMerkleBranch(const uint256& block_hash, int posInBlock) { // Update the tx's hashBlock |