AaronFiore/electrum
1
0
Fork 0
Code Activity

simplify wallet types

Browse Source
This commit is contained in:
ThomasV
2016-08-19 17:26:57 +02:00
parent 058e49e839
commit 24a9ff3fef
4 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/base_wizard.py
View File

@@ -25,7 +25,7 @@
import os
import keystore
from wallet import Wallet, Imported_Wallet, Standard_Wallet, Multisig_Wallet, WalletStorage
from wallet import Wallet, Imported_Wallet, Standard_Wallet, Multisig_Wallet, WalletStorage, wallet_types
from i18n import _
from plugins import run_hook
@@ -76,11 +76,10 @@ class BaseWizard(object):
])
wallet_kinds = [
('standard', _("Standard wallet")),
('twofactor', _("Wallet with two-factor authentication")),
('2fa', _("Wallet with two-factor authentication")),
('multisig', _("Multi-signature wallet")),
]
registered_kinds = Wallet.categories()
choices = wallet_kinds#[pair for pair in wallet_kinds if pair[0] in registered_kinds]
choices = [pair for pair in wallet_kinds if pair[0] in wallet_types]
self.choice_dialog(title=title, message=message, choices=choices, run_next=self.on_wallet_type)
def on_wallet_type(self, choice):
@@ -89,7 +88,7 @@ class BaseWizard(object):
action = 'choose_keystore'
elif choice == 'multisig':
action = 'choose_multisig'
elif choice == 'twofactor':
elif choice == '2fa':
self.storage.put('wallet_type', '2fa')
self.storage.put('use_trustedcoin', True)
self.plugin = self.plugins.load_plugin('trustedcoin')