From dfaf2eb8ddfca8e07832665941fb4042999a26f6 Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 24 Feb 2023 08:52:53 +0000 Subject: [PATCH 1/2] Merge bitcoin/bitcoin#27151: util: Remove duplicate include e8462690a9ff0b4155c31981fd97be16663ebb35 util: Remove duplicate include (Andrew Chow) Pull request description: Duplicate `#include ` is upsetting the linter. ACKs for top commit: davidgumberg: ACK https://github.com/bitcoin/bitcoin/pull/27151/commits/e8462690a9ff0b4155c31981fd97be16663ebb35 theStack: ACK e8462690a9ff0b4155c31981fd97be16663ebb35 john-moffett: ACK e8462690a9ff0b4155c31981fd97be16663ebb35 Tree-SHA512: 9e45d8f6a2dd5efcb8eb1c3c440d94b16490dbd63255784cb39863767fa07227e06da112a150ef337ef89e2e305b60b00d5b1c12ff7e1e9c02f6648ed97fac8c --- src/support/lockedpool.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp index 6c3aaa9f04fa..651af4c84980 100644 --- a/src/support/lockedpool.cpp +++ b/src/support/lockedpool.cpp @@ -25,7 +25,6 @@ #include #include #endif -#include LockedPoolManager* LockedPoolManager::_instance = nullptr; From f490c343a22bd625f278b877f1ebbf4ac3e11121 Mon Sep 17 00:00:00 2001 From: fanquake Date: Mon, 15 Aug 2022 13:31:58 +0100 Subject: [PATCH 2/2] Merge bitcoin/bitcoin#25849: refactor: Remove not needed empty RPC doc std::string fac09f4f7a0f56335a105e4ca30a17fc5c22c961 refactor: Remove not needed empty RPC doc std::string (MacroFake) Pull request description: Not sure why this was put there, so remove it ACKs for top commit: aureleoules: ACK fac09f4f7a0f56335a105e4ca30a17fc5c22c961. Tree-SHA512: 7fae9c612dbb82db39e3dc6e20cc7d0c8128f4abf27e34f4854f908dc1bf3ad48ebee2dbbb864a9ce95e98c5d57119bf976793945a2084a43d137c2d95a25ea1 --- src/wallet/rpc/spend.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wallet/rpc/spend.cpp b/src/wallet/rpc/spend.cpp index f44eedff2bc8..d11267d90cb7 100644 --- a/src/wallet/rpc/spend.cpp +++ b/src/wallet/rpc/spend.cpp @@ -335,8 +335,8 @@ RPCHelpMan sendmany() {"use_is", RPCArg::Type::BOOL, RPCArg::Default{false}, "Deprecated and ignored"}, {"use_cj", RPCArg::Type::BOOL, RPCArg::Default{false}, "Use CoinJoin funds only"}, {"conf_target", RPCArg::Type::NUM, RPCArg::DefaultHint{"wallet -txconfirmtarget"}, "Confirmation target in blocks"}, - {"estimate_mode", RPCArg::Type::STR, RPCArg::Default{"unset"}, std::string() + "The fee estimate mode, must be one of (case insensitive):\n" - " \"" + FeeModes("\"\n\"") + "\""}, + {"estimate_mode", RPCArg::Type::STR, RPCArg::Default{"unset"}, "The fee estimate mode, must be one of (case insensitive):\n" + "\"" + FeeModes("\"\n\"") + "\""}, {"fee_rate", RPCArg::Type::AMOUNT, RPCArg::DefaultHint{"not set, fall back to wallet fee estimation"}, "Specify a fee rate in " + CURRENCY_ATOM + "/B."}, {"verbose", RPCArg::Type::BOOL, RPCArg::Default{false}, "If true, return extra information about the transaction."}, }, @@ -450,8 +450,8 @@ static std::vector FundTxDoc(bool solving_data = true) { std::vector args = { {"conf_target", RPCArg::Type::NUM, RPCArg::DefaultHint{"wallet -txconfirmtarget"}, "Confirmation target in blocks"}, - {"estimate_mode", RPCArg::Type::STR, RPCArg::Default{"unset"}, std::string() + "The fee estimate mode, must be one of (case insensitive):\n" - " \"" + FeeModes("\"\n\"") + "\""}, + {"estimate_mode", RPCArg::Type::STR, RPCArg::Default{"unset"}, "The fee estimate mode, must be one of (case insensitive):\n" + "\"" + FeeModes("\"\n\"") + "\""}, }; if (solving_data) { args.push_back({"solving_data", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED_NAMED_ARG, "Keys and scripts needed for producing a final transaction with a dummy signature.\n" @@ -920,8 +920,8 @@ RPCHelpMan send() }, }, {"conf_target", RPCArg::Type::NUM, RPCArg::DefaultHint{"wallet -txconfirmtarget"}, "Confirmation target in blocks"}, - {"estimate_mode", RPCArg::Type::STR, RPCArg::Default{"unset"}, std::string() + "The fee estimate mode, must be one of (case insensitive):\n" - " \"" + FeeModes("\"\n\"") + "\""}, + {"estimate_mode", RPCArg::Type::STR, RPCArg::Default{"unset"}, "The fee estimate mode, must be one of (case insensitive):\n" + "\"" + FeeModes("\"\n\"") + "\""}, {"fee_rate", RPCArg::Type::AMOUNT, RPCArg::DefaultHint{"not set, fall back to wallet fee estimation"}, "Specify a fee rate in " + CURRENCY_ATOM + "/B."}, {"options", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED_NAMED_ARG, "", Cat>(