From fe7815cb731d7246917c6908419895bd8f3734da Mon Sep 17 00:00:00 2001 From: Konstantin Akimov Date: Fri, 12 Aug 2022 02:10:25 +0700 Subject: [PATCH] Clean up conflict resolving artefacts after backport #17260 Removed enum OutputType Removed unexisting method GetNewChangeDestination --- src/wallet/scriptpubkeyman.h | 2 -- src/wallet/wallet.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h index 7900b4235f..650fcd0daf 100644 --- a/src/wallet/scriptpubkeyman.h +++ b/src/wallet/scriptpubkeyman.h @@ -14,8 +14,6 @@ #include -enum class OutputType; - // Wallet storage things that ScriptPubKeyMans need in order to be able to store things to the wallet database. // It provides access to things that are part of the entire wallet and not specific to a ScriptPubKeyMan such as // wallet flags, wallet version, encryption keys, encryption status, and the database itself. This allows a diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 883013f6b8..7ec6c3c7ff 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1063,8 +1063,6 @@ public: std::set GetLabelAddresses(const std::string& label) const; - bool GetNewChangeDestination(const OutputType type, CTxDestination& dest, std::string& error); - isminetype IsMine(const CTxDestination& dest) const; isminetype IsMine(const CScript& script) const; isminetype IsMine(const CTxIn& txin) const;