AaronFiore/electrum
1
0
Fork 0
Code Activity

account:simplification

Browse Source
This commit is contained in:
ThomasV
2014-04-03 14:30:00 +02:00
parent 9c34f9a1da
commit 4fb5296a92
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/account.py
View File

@@ -190,7 +190,7 @@ class BIP32_Account_2of2(BIP32_Account):
return address return address
def get_pubkeys(self, sequence): 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): def get_master_pubkeys(self):
return [self.xpub, self.xpub2] return [self.xpub, self.xpub2]
@@ -210,9 +210,6 @@ class BIP32_Account_2of3(BIP32_Account_2of2):
d['xpub3'] = self.xpub3 d['xpub3'] = self.xpub3
return d 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): def get_master_pubkeys(self):
return [self.xpub, self.xpub2, self.xpub3] return [self.xpub, self.xpub2, self.xpub3]