LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-27 15:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

close #4102

Browse source 
close #3337
This commit is contained in:
SomberNight 2018-03-12 04:00:27 +01:00
parent d3065f73bf
commit a048a00594
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/storage.py
View file

@ -51,6 +51,8 @@ FINAL_SEED_VERSION = 16 # electrum >= 2.7 will set this to prevent
def multisig_type(wallet_type): def multisig_type(wallet_type):
'''If wallet_type is mofn multi-sig, return [m, n], '''If wallet_type is mofn multi-sig, return [m, n],
otherwise return None.''' otherwise return None.'''
if not wallet_type:
return None
match = re.match('(\d+)of(\d+)', wallet_type) match = re.match('(\d+)of(\d+)', wallet_type)
if match: if match:
match = [int(x) for x in match.group(1, 2)] match = [int(x) for x in match.group(1, 2)]
@ -417,7 +419,7 @@ class WalletStorage(PrintError):
d['seed'] = seed d['seed'] = seed
self.put(key, d) self.put(key, d)
else: else:
raise raise Exception('Unable to tell wallet type. Is this even a wallet file?')
# remove junk # remove junk
self.put('master_public_key', None) self.put('master_public_key', None)
self.put('master_public_keys', None) self.put('master_public_keys', None)

2
lib/wallet.py
View file

@ -2301,5 +2301,5 @@ class Wallet(object):
return Multisig_Wallet return Multisig_Wallet
if wallet_type in wallet_constructors: if wallet_type in wallet_constructors:
return wallet_constructors[wallet_type] return wallet_constructors[wallet_type]
raise RuntimeError("Unknown wallet type: " + wallet_type) raise RuntimeError("Unknown wallet type: " + str(wallet_type))