Revert mistaken commit

lib/wallet.py

@@ -1916,7 +1916,10 @@ class Wallet(object):
         if wallet_type:
             for cat, t, name, loader in wallet_types:
                 if t == wallet_type:
-                    WalletClass = loader
+                    if cat in ['hardware', 'twofactor']:
+                        WalletClass = lambda storage: apply(loader().constructor, (storage,))
+                    else:
+                        WalletClass = loader
                     break
             else:
                 if re.match('(\d+)of(\d+)', wallet_type):

plugins/ledger/ledger.py

@@ -424,6 +424,9 @@ class LedgerPlugin(BasePlugin):
         self.wallet = None
         self.handler = None
 
+    def constructor(self, s):
+        return BTChipWallet(s)
+
     def is_enabled(self):
         if not BTCHIP:
             return False

plugins/trezor/plugin.py

@@ -158,6 +158,9 @@ class TrezorCompatiblePlugin(BasePlugin):
         self.handler = None
         self.client = None
 
+    def constructor(self, s):
+        return self.wallet_class(s)
+
     def give_error(self, message):
         self.print_error(message)
         raise Exception(message)

plugins/trustedcoin/trustedcoin.py

@@ -276,6 +276,9 @@ class TrustedCoinPlugin(BasePlugin):
         BasePlugin.__init__(self, parent, config, name)
         self.seed_func = lambda x: bitcoin.is_new_seed(x, SEED_PREFIX)
 
+    def constructor(self, s):
+        return Wallet_2fa(s)
+
     def is_available(self):
         return True