CKeystore/CCrypter: move relevant implementation out of the header #11272

pull jonasschnelli wants to merge 3 commits into bitcoin:master from jonasschnelli:2017/09/wallet_refact changing 4 files +117 −127

jonasschnelli commented at 8:34 PM on September 7, 2017: contributor

No description provided.
jonasschnelli added the label Refactoring on Sep 7, 2017
laanwj added the label Wallet on Sep 7, 2017
laanwj commented at 8:35 PM on September 7, 2017: member

Concept ACK (haven't verified move-only)
in src/keystore.cpp:57 in b32f558e7e outdated
```
  55 | +    }
  56 | +    return set_address;
  57 | +}
  58 | +
  59 | +bool CBasicKeyStore::GetKey(const CKeyID &address, CKey &keyOut) const
  60 | +    {
```
meshcollider commented at 4:42 AM on September 10, 2017:

Missing opening brace for function, which is why travis is failing

jonasschnelli commented at 6:50 PM on September 10, 2017:

Thanks! Fixed.
jonasschnelli force-pushed on Sep 10, 2017
dcousens approved

in src/wallet/crypter.cpp:302 in c154688878 outdated

 298 | @@ -275,6 +299,19 @@ bool CCryptoKeyStore::GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) co
 299 |      }
 300 |  }
 301 |  
 302 | +std::set<CKeyID> CCryptoKeyStore::GetKeys() const override

jimpo commented at 9:16 PM on September 11, 2017:

Remove override (Travis failure)

jonasschnelli commented at 11:56 PM on September 12, 2017:

Fixed. Thanks.

jonasschnelli force-pushed on Sep 12, 2017
benma commented at 11:27 AM on September 13, 2017: none

ACK c6c9661574f7b06aa55e54e6b2805c7ac51ff80e
in src/keystore.cpp:41 in c6c9661574 outdated
```
  35 | @@ -36,6 +36,40 @@ bool CBasicKeyStore::AddKeyPubKey(const CKey& key, const CPubKey &pubkey)
  36 |      return true;
  37 |  }
  38 |  
  39 | +bool CBasicKeyStore::HaveKey(const CKeyID &address) const
  40 | +{
  41 | +    bool result;
```
TheBlueMatt commented at 3:59 PM on September 14, 2017:

Feel like fixing this gook in a new commit while you're at it?

Just LOCK(cs_KeyStore); return mapKeys.count(address) > 0; should work just as well (there are a few more of these later down).
TheBlueMatt commented at 4:03 PM on September 14, 2017: member

Looks good, would be nice to clean up while you're at it.
CKeystore: move relevant implementation out of the header 3155fd23f2
CCrypter: move relevant implementation out of the header 208fda69b3
jonasschnelli force-pushed on Oct 5, 2017
jonasschnelli commented at 3:32 AM on October 5, 2017: contributor

Fixed the gook-ish code part mentioned by @TheBlueMatt
TheBlueMatt commented at 9:20 PM on October 5, 2017: member

Heh, mind doing that for GetKey, CCryptoKeyStore::IsLocked, CCryptoKeyStore::HaveKey, etc as well? No need for scopes just for return statements.
Fix code style in keystore.cpp/crypter.cpp dd9bb253c3
jonasschnelli commented at 3:57 AM on October 7, 2017: contributor

Added a code-style/folding cleanup commit.
TheBlueMatt commented at 3:03 PM on October 17, 2017: member

utACK dd9bb253c3a6be29dd2749ca34e4ec7eb6b593bb
laanwj commented at 8:11 PM on November 9, 2017: member

Verified moves-ack dd9bb25
laanwj merged this on Nov 9, 2017
laanwj closed this on Nov 9, 2017
laanwj referenced this in commit e6e3fc3951 on Nov 9, 2017
PastaPastaPasta referenced this in commit 04d0b3f2b9 on Dec 22, 2019
PastaPastaPasta referenced this in commit 84b9631133 on Jan 2, 2020
PastaPastaPasta referenced this in commit 84feb311a9 on Jan 4, 2020
PastaPastaPasta referenced this in commit e6f4ba7330 on Jan 12, 2020
PastaPastaPasta referenced this in commit 234a082374 on Jan 12, 2020
PastaPastaPasta referenced this in commit 1505cc0d4b on Jan 12, 2020
PastaPastaPasta referenced this in commit 779a8149c2 on Jan 12, 2020
PastaPastaPasta referenced this in commit 6baf34740b on Jan 12, 2020
PastaPastaPasta referenced this in commit 7abe277fe9 on Jan 12, 2020
PastaPastaPasta referenced this in commit 7424846fba on Jan 16, 2020
PastaPastaPasta referenced this in commit 5f36d82199 on Jan 16, 2020
PastaPastaPasta referenced this in commit dcb470dd10 on Jan 22, 2020
PastaPastaPasta referenced this in commit 61887885cb on Jan 22, 2020
PastaPastaPasta referenced this in commit 707d9a9503 on Jan 22, 2020
PastaPastaPasta referenced this in commit 43a10410b8 on Jan 22, 2020
PastaPastaPasta referenced this in commit a68ac0e174 on Jan 29, 2020
PastaPastaPasta referenced this in commit 73065408b2 on Jan 29, 2020
PastaPastaPasta referenced this in commit 1975227443 on Jan 29, 2020
PastaPastaPasta referenced this in commit 8221b9cd0f on Jan 29, 2020
PastaPastaPasta referenced this in commit 42eba05dcd on Jan 31, 2020
PastaPastaPasta referenced this in commit 61d63313d7 on Jan 31, 2020
PastaPastaPasta referenced this in commit a8bf357bd1 on Jan 31, 2020
PastaPastaPasta referenced this in commit 0714905349 on Jan 31, 2020
PastaPastaPasta referenced this in commit 4de68eae6b on Jan 31, 2020
UdjinM6 referenced this in commit 0294caac0a on Feb 4, 2020
ckti referenced this in commit 2360221d8a on Mar 28, 2021
gades referenced this in commit 440f566fbb on Jun 30, 2021
DrahtBot locked this on Sep 8, 2021

Contributors

Labels