Remove constructor method of plugins

Clean up wallet class loading.

lib/plugins.py

@@ -118,10 +118,13 @@ class Plugins(DaemonThread):
         return result
 
     def register_plugin_wallet(self, name, gui_good, details):
+        def dynamic_constructor(storage):
+            return self.wallet_plugin_loader(name).wallet_class(storage)
+
         if details[0] == 'hardware':
             self.hw_wallets[name] = (gui_good, details)
-        register = details + (lambda: self.wallet_plugin_loader(name),)
-        wallet.wallet_types.append(register)
+        self.print_error("registering wallet %s: %s" %(name, details))
+        wallet.wallet_types.append(details + (dynamic_constructor,))
 
     def wallet_plugin_loader(self, name):
         if not name in self.plugins:

lib/wallet.py

@@ -1908,25 +1908,7 @@ class Wallet(object):
             raise BaseException(msg)
 
         wallet_type = storage.get('wallet_type')
-        if wallet_type:
-            for cat, t, name, loader in wallet_types:
-                if t == wallet_type:
-                    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):
-                    WalletClass = Multisig_Wallet
-                else:
-                    raise RuntimeError("Unknown wallet type: " + wallet_type)
-        else:
-            if seed_version == OLD_SEED_VERSION:
-                WalletClass = OldWallet
-            else:
-                WalletClass = NewWallet
-
+        WalletClass = Wallet.wallet_class(wallet_type, seed_version)
         wallet = WalletClass(storage)
 
         # Convert hardware wallets restored with older versions of
@@ -1940,6 +1922,20 @@ class Wallet(object):
 
         return wallet
 
+    @staticmethod
+    def wallet_class(wallet_type, seed_version):
+        if wallet_type:
+            if Wallet.multisig_type(wallet_type):
+                return Multisig_Wallet
+
+            for info in wallet_types:
+                if wallet_type == info[1]:
+                    return info[3]
+
+            raise RuntimeError("Unknown wallet type: " + wallet_type)
+
+        return OldWallet if seed_version == OLD_SEED_VERSION else NewWallet
+
     @staticmethod
     def is_seed(seed):
         return is_old_seed(seed) or is_new_seed(seed)