sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 04:22:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up conflict resolving artefacts after backport #17260

Browse Source 
Removed enum OutputType
Removed unexisting method GetNewChangeDestination
This commit is contained in:
Konstantin Akimov 2022-08-12 02:10:25 +07:00
parent d47af2c4bf
commit fe7815cb73
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/scriptpubkeyman.h
View File

@ -14,8 +14,6 @@
#include <boost/signals2/signal.hpp> #include <boost/signals2/signal.hpp>
enum class OutputType;
// Wallet storage things that ScriptPubKeyMans need in order to be able to store things to the wallet database. // 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 // 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 // wallet flags, wallet version, encryption keys, encryption status, and the database itself. This allows a

2
src/wallet/wallet.h
View File

@ -1063,8 +1063,6 @@ public:
std::set<CTxDestination> GetLabelAddresses(const std::string& label) const; std::set<CTxDestination> 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 CTxDestination& dest) const;
isminetype IsMine(const CScript& script) const; isminetype IsMine(const CScript& script) const;
isminetype IsMine(const CTxIn& txin) const; isminetype IsMine(const CTxIn& txin) const;