diff options
| author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-01-23 10:12:51 +0100 |
|---|---|---|
| committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-01-23 10:12:58 +0100 |
| commit | a8c1ea50c74fc2b9e34e18cac0b15399b89b9662 (patch) | |
| tree | 11497ddaa3589586f7d70898a0d6133e3cb66978 /src/wallet/rpc/backup.cpp | |
| parent | f99b85642ff16b6687df10f3f323d111f4f0ee98 (diff) | |
| parent | 83f70c8e860556426305b1d70fa0a3276784e360 (diff) | |
Merge bitcoin/bitcoin#26919: scripted-diff: use RPCArg::Optional::OMITTED over OMITTED_NAMED_ARG
83f70c8e860556426305b1d70fa0a3276784e360 doc: improve doc for RPCArg::Optional::OMITTED (fanquake)
ea8c7daf7a557853a3e5e615d3aa4a6651cc799d scripted-diff: use RPCArg::Optional::OMITTED over OMITTED_NAMED_ARG (fanquake)
Pull request description:
Remove deprecated `RPCArg::Optional::OMITTED_NAMED_ARG` in favour of `OMITTED`.
ACKs for top commit:
kouloumos:
re-ACK 83f70c8e860556426305b1d70fa0a3276784e360
aureleoules:
ACK 83f70c8e860556426305b1d70fa0a3276784e360
Tree-SHA512: caba82c0f9f7969d7534bdcdcdfd80b94c16750598343ce63af28e0d579bfd49405bf28acd66dbc6c9a720f040b0e146a5efdff79ebc5ac7364dab54ab16c4a6
Diffstat (limited to 'src/wallet/rpc/backup.cpp')
| -rw-r--r-- | src/wallet/rpc/backup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp index ab46706084..71a913c9e0 100644 --- a/src/wallet/rpc/backup.cpp +++ b/src/wallet/rpc/backup.cpp @@ -1292,7 +1292,7 @@ RPCHelpMan importmulti() }, }, RPCArgOptions{.oneline_description="\"requests\""}}, - {"options", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED_NAMED_ARG, "", + {"options", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED, "", { {"rescan", RPCArg::Type::BOOL, RPCArg::Default{true}, "Scan the chain and mempool for wallet transactions after all imports."}, }, @@ -1891,7 +1891,7 @@ RPCHelpMan restorewallet() { {"wallet_name", RPCArg::Type::STR, RPCArg::Optional::NO, "The name that will be applied to the restored wallet"}, {"backup_file", RPCArg::Type::STR, RPCArg::Optional::NO, "The backup file that will be used to restore the wallet."}, - {"load_on_startup", RPCArg::Type::BOOL, RPCArg::Optional::OMITTED_NAMED_ARG, "Save wallet name to persistent settings and load on startup. True to add wallet to startup list, false to remove, null to leave unchanged."}, + {"load_on_startup", RPCArg::Type::BOOL, RPCArg::Optional::OMITTED, "Save wallet name to persistent settings and load on startup. True to add wallet to startup list, false to remove, null to leave unchanged."}, }, RPCResult{ RPCResult::Type::OBJ, "", "", |