electrum

commit a194edbefb419356701fd20b5f782d9832d5ad61
parent 4fb5296a925ef19e38c8c6b0b4c778e281aae719
Author: ThomasV <thomasv@gitorious>
Date:   Thu,  3 Apr 2014 14:32:03 +0200

account:simplification

Diffstat:
M
lib/account.py
 | 
5
+----

1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/lib/account.py b/lib/account.py
@@ -157,7 +157,7 @@ class BIP32_Account(Account):
         return None
 
     def get_pubkeys(self, sequence):
-        return [self.get_pubkey(self.xpub, *sequence)]
+        return sorted(map(lambda x: self.get_pubkey(x, *sequence ), self.get_master_pubkeys()))
 
     def get_master_pubkeys(self):
         return [self.xpub]
@@ -189,9 +189,6 @@ class BIP32_Account_2of2(BIP32_Account):
         address = hash_160_to_bc_address(hash_160(self.redeem_script((for_change, n)).decode('hex')), 5)
         return address
 
-    def get_pubkeys(self, sequence):
-        return sorted(map(lambda x: self.get_pubkey(x, *sequence ), self.get_master_pubkeys()))
-
     def get_master_pubkeys(self):
         return [self.xpub, self.xpub2]