diff options
author | MacroFake <falke.marco@gmail.com> | 2022-08-10 14:19:11 +0200 |
---|---|---|
committer | MacroFake <falke.marco@gmail.com> | 2022-08-10 14:19:17 +0200 |
commit | a6fc293c0a1f27ba1e573bfa16fd76d5f58988b2 (patch) | |
tree | bdf4912877caaf7e22365780180193ddd4494d99 /src/wallet/wallet.h | |
parent | aac200801b66f1300e618c115a6e3df9b01c9ec3 (diff) | |
parent | 76b3c37fcb93b4bcb047e0500fdaa605160e25d5 (diff) | |
download | bitcoin-a6fc293c0a1f27ba1e573bfa16fd76d5f58988b2.tar.xz |
Merge bitcoin/bitcoin#25656: refactor: wallet: return util::Result from `GetReservedDestination` methods
76b3c37fcb93b4bcb047e0500fdaa605160e25d5 refactor: wallet: return util::Result from `GetReservedDestination` methods (Sebastian Falbesoner)
Pull request description:
This PR is a follow-up to #25218, as suggested in comment https://github.com/bitcoin/bitcoin/pull/25218#discussion_r907710067. The interfaces of the methods `ReserveDestination::GetReservedDestination`, `{Legacy,Descriptor,}ScriptPubKeyMan::GetReservedDestination` are improved by returning `util::Result<CTxDestination>` instead of `bool` in order to get rid of the two `CTxDestination&` and `bilingual_str&` out-parameters.
ACKs for top commit:
furszy:
ACK 76b3c37f
Tree-SHA512: bf15560a88d645bcf8768024013d36012cd65caaa4a613e8a055dfd8f29cb4a219c19084606992bad177920cdca3a732ec168e9b9526f9295491f2cf79cc6815
Diffstat (limited to 'src/wallet/wallet.h')
-rw-r--r-- | src/wallet/wallet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 801ac5533a..cf33ea21f2 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -191,7 +191,7 @@ public: } //! Reserve an address - bool GetReservedDestination(CTxDestination& pubkey, bool internal, bilingual_str& error); + util::Result<CTxDestination> GetReservedDestination(bool internal); //! Return reserved address void ReturnDestination(); //! Keep the address. Do not return it's key to the keypool when this object goes out of scope |