refactor: Combine GetWalletForJSONRPCRequest and EnsureWalletIsAvailable functions #19100

1. 
   ryanofsky commented at 9:35 pm on May 28, 2020: member

   This simplifies control flow and also helps get rid of the ::vpwallets variable in #19101 since EnsureWalletIsAvailable doesn’t have access to the request context.
2. 
   MarcoFalke commented at 10:21 pm on May 28, 2020: member

   Concept ACK removing all that copy-paste boilerplate
3. DrahtBot added the label Refactoring on May 28, 2020
4. DrahtBot added the label RPC/REST/ZMQ on May 28, 2020
5. DrahtBot added the label Wallet on May 28, 2020
6. 
   DrahtBot commented at 6:47 am on May 29, 2020: member

   The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

   Conflicts

   Reviewers, this pull request conflicts with the following ones:

   • #18654 (rpc: separate bumpfee’s psbt creation function into psbtbumpfee by achow101)
   • #18531 (rpc: Assert that RPCArg names are equal to CRPCCommand ones by MarcoFalke)

   If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

7. 
   promag commented at 0:40 am on June 1, 2020: member

   Code review ACK 5a431c350e343e3c416ee8c2fadd36d999ff2518.
8. refactor: Combine GetWalletForJSONRPCRequest and EnsureWalletIsAvailable functions

   This simplifies control flow and also helps get rid of the ::vpwallets
   variable, because EnsureWalletIsAvailable doesn't have access to the request
   context.

   f42f5e58f5
9. in src/wallet/rpcwallet.cpp:2565 in 5a431c350e outdated

   2462@@ -2550,12 +2463,7 @@ static UniValue listwallets(const JSONRPCRequest& request)
   2463     UniValue obj(UniValue::VARR);
   2464 
   2465     for (const std::shared_ptr<CWallet>& wallet : GetWallets()) {
   2466-        if (!EnsureWalletIsAvailable(wallet.get(), request.fHelp)) {
   2467-            return NullUniValue;
   2468-        }
   

   ---

   ---

   

   ryanofsky commented at 3:29 pm on June 1, 2020:

   Note: PR is just dropping the Ensure check here which has been around since 9508761ed69a30f4af24fbc9274176056431abfb. It seems like it never did anything because the wallet pointer would never be null, and it was probably added originally as a precaution

   ---

   

   promag commented at 11:05 am on June 11, 2020:

   Agree.
10. DrahtBot added the label Needs rebase on Jun 5, 2020
11. ryanofsky force-pushed on Jun 5, 2020
12. 
    ryanofsky commented at 12:41 pm on June 5, 2020: member

    Rebased 5a431c350e343e3c416ee8c2fadd36d999ff2518 -> f42f5e58f5fd063d5feec3eadf4a4040a941d4af (pr/ensa.1 -> pr/ensa.2, compare) due to conflict with #19096
13. DrahtBot removed the label Needs rebase on Jun 5, 2020
14. 
    promag commented at 11:43 am on June 11, 2020: member

    Tested ACK f42f5e58f5fd063d5feec3eadf4a4040a941d4af.
15. 
    MarcoFalke commented at 1:51 pm on June 11, 2020: member

    ACK f42f5e58f5fd063d5feec3eadf4a4040a941d4af (reviewed code to check that this is a refactor) 💢

    Signature:

     0-----BEGIN PGP SIGNED MESSAGE-----
     1Hash: SHA512
     2
     3ACK f42f5e58f5fd063d5feec3eadf4a4040a941d4af (reviewed code to check that this is a refactor) 💢
     4-----BEGIN PGP SIGNATURE-----
     5
     6iQGzBAEBCgAdFiEE+rVPoUahrI9sLGYTzit1aX5ppUgFAlwqrYAACgkQzit1aX5p
     7pUi8SQv/Q7tX1S0X8I7F/3+3cNWQdZwQ0wytqNJQy5fBL9hxrjUO19DK35ngFdvl
     8Y6yn5FJWhW1uy2f5Au2471EiD6Jo29vSNabx6ctIzFp2SAzoOUUVPYfrxKVpz8cU
     9SIuG+NxjD6fYBq7PYL5V3P1qQWD25FLm1KrVz01Y3ePUd0P9mYYIKz0SvUG1MfLI
    106ZrI+ou/k4JqKdXVpL5n7mAJkAh9HpXmqE4VP3EuVrZRp56t2MePvwc+iZY44bL5
    11vCdYQRuB+H9my1R3/xcG6fZaFBrNPo4BM8T8PniR3sSCbR24WL8JbxoBh4EhbRRz
    12iRdDFDGLdtOm9a/hkGT2uLCA83R6j1QzZmLyON3CnY//TmwCDgasr3Ds7tt2pR5t
    13de1NtCLLvS3/bZNz5c9JtniSQctCYsu75b5JU4rwuodFDRGmoN2mlKNJglhXQfGZ
    14ZVAlQ4udZa1DSDA4ivMh+X8oIx1hiTQys/duGhjw3Vrfb9lCtsnEEpyN/FWcEFV6
    15VJhE7CAU
    16=xs4O
    17-----END PGP SIGNATURE-----
    

    Timestamp of file with hash 91abc4cab5ad750fa39568a9cdd77f33c2cfdb2f05ec0fcf18b5c862634b598f -

16. MarcoFalke merged this on Jun 11, 2020
17. MarcoFalke closed this on Jun 11, 2020

    ---

18. sidhujag referenced this in commit 4085e64c21 on Jun 11, 2020
19. Fabcien referenced this in commit 51c94b782d on Apr 29, 2021
20. cryptapus referenced this in commit 72b476a0cf on May 3, 2021
21. cryptapus referenced this in commit d481525cc9 on May 3, 2021
22. DrahtBot locked this on Feb 15, 2022

Contributors
ryanofsky MarcoFalke DrahtBot promag

Labels
Refactoring Wallet RPC/REST/ZMQ