rpcwallet: use EnsureWalletIsUnlocked() where possible #3178

pull Diapolo wants to merge 1 commits into bitcoin:master from Diapolo:rpc changing 1 files +5 −6

Diapolo commented at 12:02 PM on October 28, 2013: none
- replaces a pwalletMain->IsLocked() check
- in keypoolrefill init kpSize to 0 as we have the logic to determine max kpSize in pwalletMain->TopUpKeyPool() anyway
Diapolo commented at 5:13 PM on November 12, 2013: none

This should be rather uncontroversial, no?
sipa commented at 6:55 PM on November 14, 2013: member

ACK
Diapolo commented at 2:23 PM on November 24, 2013: none

Uncontroversial IMHO ;), no?

rpcwallet: use EnsureWalletIsUnlocked() where possible

- replaces a pwalletMain->IsLocked() check
- in keypoolrefill init kpSize to 0 as we have the logic to determine max
  kpSize in pwalletMain->TopUpKeyPool() anyway

f914c7a1a4

in src/rpcwallet.cpp:None in 33f9506ede outdated
```
1655 | @@ -1657,15 +1656,14 @@ Value keypoolrefill(const Array& params, bool fHelp)
1656 |              + HelpExampleRpc("keypoolrefill", "")
1657 |          );
1658 |  
1659 | -    unsigned int kpSize = max(GetArg("-keypool", 100), (int64_t) 0);
1660 | +    unsigned int kpSize = 0;
```
laanwj commented at 3:01 PM on December 9, 2013:

This is correct, but makes it slightly harder to read/understand. Maybe add a comment that 0 is interpreted by TopUpKeyPool as the default keypool size given by -keypool.

Diapolo commented at 3:19 PM on December 9, 2013:

Comment added...
laanwj referenced this in commit 20a3c80790 on Dec 9, 2013
laanwj merged this on Dec 9, 2013
laanwj closed this on Dec 9, 2013
Diapolo deleted the branch on Dec 9, 2013
BitcoinPullTester commented at 3:46 PM on December 9, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/f914c7a1a47657b75f2d54b7a1f5a299772f1cae for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
Bushstar referenced this in commit bbd9b10d47 on Apr 8, 2020
DrahtBot locked this on Sep 8, 2021

Contributors