Skip to content

Commit 1571086

Browse files
committed
wallet: Remove ISMINE_WATCH_ONLY
ISMINE_WATCH_ONLY has been removed from all places it was being used, and migration does not need ISMINE_WATCH_ONLY, so remove the enum.
1 parent 4439bf4 commit 1571086

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

src/wallet/scriptpubkeyman.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ isminetype LegacyDataSPKM::IsMine(const CScript& script) const
204204
case IsMineResult::NO:
205205
return ISMINE_NO;
206206
case IsMineResult::WATCH_ONLY:
207-
return ISMINE_WATCH_ONLY;
208207
case IsMineResult::SPENDABLE:
209208
return ISMINE_SPENDABLE;
210209
}

src/wallet/types.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ namespace wallet {
2525
*
2626
* For LegacyScriptPubKeyMan,
2727
* ISMINE_NO: the scriptPubKey is not in the wallet;
28-
* ISMINE_WATCH_ONLY: the scriptPubKey has been imported into the wallet;
2928
* ISMINE_SPENDABLE: the scriptPubKey corresponds to an address owned by the wallet user (can spend with the private key);
3029
* ISMINE_USED: the scriptPubKey corresponds to a used address owned by the wallet user;
3130
* ISMINE_ALL: all ISMINE flags except for USED;
@@ -40,10 +39,9 @@ namespace wallet {
4039
*/
4140
enum isminetype : unsigned int {
4241
ISMINE_NO = 0,
43-
ISMINE_WATCH_ONLY = 1 << 0,
4442
ISMINE_SPENDABLE = 1 << 1,
4543
ISMINE_USED = 1 << 2,
46-
ISMINE_ALL = ISMINE_WATCH_ONLY | ISMINE_SPENDABLE,
44+
ISMINE_ALL = ISMINE_SPENDABLE,
4745
ISMINE_ALL_USED = ISMINE_ALL | ISMINE_USED,
4846
ISMINE_ENUM_ELEMENTS,
4947
};

0 commit comments

Comments
 (0)