From d92a6d46eb4b534100ceafefa7379ea4f425dd5c Mon Sep 17 00:00:00 2001 From: SomberNight Date: Tue, 30 Jan 2018 00:44:40 +0100 Subject: [PATCH] wallet.is_mine: use inheritance for more readable code --- lib/wallet.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/wallet.py b/lib/wallet.py index e38901e8e..7087e9181 100644 --- a/lib/wallet.py +++ b/lib/wallet.py @@ -332,10 +332,6 @@ class Abstract_Wallet(PrintError): return changed def is_mine(self, address): - if hasattr(self, '_addr_to_addr_index'): # Deterministic_Wallet - return address in self._addr_to_addr_index - if hasattr(self, 'addresses'): # Imported_Wallet - return address in self.addresses return address in self.get_addresses() def is_change(self, address): @@ -1466,6 +1462,9 @@ class Imported_Wallet(Simple_Wallet): def is_beyond_limit(self, address, is_change): return False + def is_mine(self, address): + return address in self.addresses + def get_fingerprint(self): return '' @@ -1712,6 +1711,9 @@ class Deterministic_Wallet(Abstract_Wallet): return False return True + def is_mine(self, address): + return address in self._addr_to_addr_index + def get_master_public_keys(self): return [self.get_master_public_key()]