New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged

laanwj merged 3 commits into bitcoin:master from jonasschnelli:2017/09/wallet_refact

Nov 9, 2017

Contributor

jonasschnelli commented Sep 7, 2017

No description provided.

jonasschnelli added the Refactoring label

laanwj added the Wallet label

Member

laanwj commented Sep 7, 2017

Concept ACK (haven't verified move-only)

meshcollider reviewed

View reviewed changes

src/keystore.cpp Outdated

    
              }

              bool CBasicKeyStore::GetKey(const CKeyID &address, CKey &keyOut) const

                  {

Contributor

meshcollider Sep 10, 2017

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

Contributor Author

jonasschnelli Sep 10, 2017

Thanks! Fixed.

jonasschnelli force-pushed the 2017/09/wallet_refact branch from b32f558 to c154688 Compare

September 10, 2017 18:50

dcousens approved these changes

View reviewed changes

jimpo reviewed

View reviewed changes

src/wallet/crypter.cpp Outdated

    
            @@ -275,6 +299,19 @@ bool CCryptoKeyStore::GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) co
          
                  }

              }

              std::set<CKeyID> CCryptoKeyStore::GetKeys() const override

Contributor

jimpo Sep 11, 2017

Remove override (Travis failure)

Contributor Author

jonasschnelli Sep 12, 2017

Fixed. Thanks.

jonasschnelli force-pushed the 2017/09/wallet_refact branch from c154688 to c6c9661 Compare

September 12, 2017 23:56

benma commented Sep 13, 2017

ACK c6c9661574f7b06aa55e54e6b2805c7ac51ff80e

TheBlueMatt reviewed

View reviewed changes

Contributor

TheBlueMatt left a comment

Looks good, would be nice to clean up while you're at it.

src/keystore.cpp Outdated

    
            @@ -36,6 +36,40 @@ bool CBasicKeyStore::AddKeyPubKey(const CKey& key, const CPubKey &pubkey)
          
                  return true;

              }

              bool CBasicKeyStore::HaveKey(const CKeyID &address) const

              {

                  bool result;

Contributor

TheBlueMatt Sep 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).

jonasschnelli added 2 commits

October 4, 2017 20:32


          CKeystore: move relevant implementation out of the header

3155fd2


          CCrypter: move relevant implementation out of the header

208fda6

jonasschnelli force-pushed the 2017/09/wallet_refact branch from c6c9661 to 208fda6 Compare

October 5, 2017 03:32

Contributor Author

jonasschnelli commented Oct 5, 2017

Fixed the gook-ish code part mentioned by @TheBlueMatt

Contributor

TheBlueMatt commented Oct 5, 2017

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

dd9bb25

Contributor Author

jonasschnelli commented Oct 7, 2017

Added a code-style/folding cleanup commit.

Contributor

TheBlueMatt commented Oct 17, 2017

utACK dd9bb25

Member

laanwj commented Nov 9, 2017

Verified moves-ack dd9bb25

laanwj merged commit dd9bb25 into bitcoin:master

laanwj added a commit that referenced this pull request


          Merge #11272: CKeystore/CCrypter: move relevant implementation out of…

e6e3fc3

… the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

04d0b3f

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

84b9631

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

84feb31

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

e6f4ba7

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

234a082

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

1505cc0

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

779a814

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

6baf347

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

7abe277

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          Revert "Merge bitcoin#11272: CKeystore/CCrypter: move relevant implem…

5f36d82

…entation out of the header"

This reverts commit 7424846.

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

dcb470d

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          Revert "Merge bitcoin#11272: CKeystore/CCrypter: move relevant implem…

…entation out of the header"

This reverts commit 7424846.

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

707d9a9

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          Revert "Merge bitcoin#11272: CKeystore/CCrypter: move relevant implem…

43a1041

…entation out of the header"

This reverts commit 7424846.

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

a68ac0e

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          Revert "Merge bitcoin#11272: CKeystore/CCrypter: move relevant implem…

…entation out of the header"

This reverts commit 7424846.

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          Revert "Merge bitcoin#11272: CKeystore/CCrypter: move relevant implem…

8221b9c

…entation out of the header"

This reverts commit 7424846.

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

42eba05

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          Revert "Merge bitcoin#11272: CKeystore/CCrypter: move relevant implem…

61d6331

…entation out of the header"

This reverts commit 7424846.

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

a8bf357

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60
Signed-off-by: Pasta <pasta@dashboost.org>

# Conflicts:
#	src/wallet/crypter.cpp
#	src/wallet/crypter.h

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          Revert "Merge bitcoin#11272: CKeystore/CCrypter: move relevant implem…

…entation out of the header"

This reverts commit a8bf357.

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

4de68ea

… out of the header

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

UdjinM6 added a commit to dashpay/dash that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

0294caa

… out of… (#3318)

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

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

* Apply suggestions from code review

Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>

Co-authored-by: Wladimir J. van der Laan <laanwj@gmail.com>
Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>

gades pushed a commit to cosanta/cosanta-core that referenced this pull request


          Merge bitcoin#11272: CKeystore/CCrypter: move relevant implementation…

440f566

… out of… (dashpay#3318)

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

dd9bb25 Fix code style in keystore.cpp/crypter.cpp (Jonas Schnelli)
208fda6 CCrypter: move relevant implementation out of the header (Jonas Schnelli)
3155fd2 CKeystore: move relevant implementation out of the header (Jonas Schnelli)

Pull request description:

Tree-SHA512: 4ce73cca5609199b74b8ff2614ee2b6af949545a1332a3a0135c6453c98665d2b0da171c1e390c9a2aec6b12b7fad931ec90084bb7c2defe243786bfc70daf60

* Apply suggestions from code review

Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>

Co-authored-by: Wladimir J. van der Laan <laanwj@gmail.com>
Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>

bitcoin locked as resolved and limited conversation to collaborators

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.