From: ThomasV <thomasv@gitorious>
Date: Thu, 3 Apr 2014 12:30:00 +0000 (+0200)
Subject: account:simplification
X-Git-Url: https://git.novaco.in/?p=electrum-nvc.git;a=commitdiff_plain;h=4fb5296a925ef19e38c8c6b0b4c778e281aae719

account:simplification
---

diff --git a/lib/account.py b/lib/account.py
index dfb7bd9..e73ad13 100644
--- a/lib/account.py
+++ b/lib/account.py
@@ -190,7 +190,7 @@ class BIP32_Account_2of2(BIP32_Account):
         return address
 
     def get_pubkeys(self, sequence):
-        return sorted([ self.get_pubkey(self.xpub, *sequence ), self.get_pubkey(self.xpub2, *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]
@@ -210,9 +210,6 @@ class BIP32_Account_2of3(BIP32_Account_2of2):
         d['xpub3'] = self.xpub3
         return d
 
-    def get_pubkeys(self, sequence):
-        return sorted([ self.get_pubkey(self.xpub, *sequence ), self.get_pubkey(self.xpub2, *sequence ), self.get_pubkey(self.xpub3, *sequence )])
-
     def get_master_pubkeys(self):
         return [self.xpub, self.xpub2, self.xpub3]