[Wallet] Trivial cleanup of HD wallet changes #8443

pull jonasschnelli wants to merge 1 commits into bitcoin:master from jonasschnelli:2016/08/hd_fixes changing 1 files +1 −2

jonasschnelli commented at 1:20 PM on August 1, 2016: contributor

Trivial cleanup. Reported by @MarcoFalke and @dooglus.
jonasschnelli added the label Refactoring on Aug 1, 2016
jonasschnelli added the label Wallet on Aug 1, 2016
MarcoFalke commented at 1:26 PM on August 1, 2016: member

I think you can use func because the wallet seems a place where a lot refactoring is happening. So we don't have yo change it each time.

Anyway, concept ACK

in src/wallet/wallet.cpp:None in e3e706f715 outdated

1199 | @@ -1200,7 +1200,7 @@ CPubKey CWallet::GenerateNewHDMasterKey()
1200 |  
1201 |          // write the key&metadata to the database
1202 |          if (!AddKeyPubKey(key, pubkey))
1203 | -            throw std::runtime_error("CWallet::GenerateNewKey(): AddKey failed");
1204 | +            throw std::runtime_error("CWallet::GenerateNewHDMasterKey(): AddKey failed");

paveljanik commented at 4:10 PM on August 1, 2016:

AddKeyPubKey failed, not AddKey. And it can't "fail" at all right now 8)

MarcoFalke commented at 4:18 PM on August 1, 2016:

The goal was to keep this in case some refactoring makes it possible that it fails.

jonasschnelli force-pushed on Aug 2, 2016
jonasschnelli commented at 7:58 AM on August 2, 2016: contributor

Fixed nits.

in src/wallet/wallet.cpp:None in a81e77e67c outdated

1199 | @@ -1200,7 +1200,7 @@ CPubKey CWallet::GenerateNewHDMasterKey()
1200 |  
1201 |          // write the key&metadata to the database
1202 |          if (!AddKeyPubKey(key, pubkey))
1203 | -            throw std::runtime_error("CWallet::GenerateNewKey(): AddKey failed");
1204 | +            throw std::runtime_error("CWallet::"+std::string(__func__)+" AddKeyPubKey failed");

paveljanik commented at 8:32 AM on August 2, 2016:

: missing?

jonasschnelli force-pushed on Aug 12, 2016
jonasschnelli commented at 12:28 PM on August 12, 2016: contributor

Fixed @paveljanik's nit.
paveljanik commented at 12:59 PM on August 12, 2016: contributor

ACK https://github.com/bitcoin/bitcoin/pull/8443/commits/a575426b8b5697f94fceb429de1e0019ddec0ecf
MarcoFalke commented at 4:27 PM on August 12, 2016: member

utACK a575426
MarcoFalke added the label Docs and Output on Aug 12, 2016
MarcoFalke removed the label Refactoring on Aug 12, 2016
MarcoFalke commented at 4:58 PM on August 18, 2016: member

@laanwj Anything holding this back?
[Wallet] Trivial cleanup of HD wallet changes 7e5d94df1f

in src/wallet/wallet.cpp:None in a575426b8b outdated

1199 | @@ -1200,7 +1200,7 @@ CPubKey CWallet::GenerateNewHDMasterKey()
1200 |  
1201 |          // write the key&metadata to the database
1202 |          if (!AddKeyPubKey(key, pubkey))
1203 | -            throw std::runtime_error("CWallet::GenerateNewKey(): AddKey failed");
1204 | +            throw std::runtime_error("CWallet::"+std::string(__func__)+": AddKeyPubKey failed");

laanwj commented at 10:22 AM on August 19, 2016:

You shouldn't prefix CWallet:: here

jonasschnelli commented at 2:23 PM on August 19, 2016:

Removed the prefix.

jonasschnelli force-pushed on Aug 19, 2016
MarcoFalke commented at 3:45 PM on August 19, 2016: member

utACK 7e5d94d
jonasschnelli merged this on Aug 19, 2016
jonasschnelli closed this on Aug 19, 2016
jonasschnelli referenced this in commit 56ac046960 on Aug 19, 2016
luke-jr referenced this in commit 464dedd6ab on Sep 21, 2016
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#8548 [wallet] Use __func__ to get function name for output printing