Update get_default_modules structure to cleaner format

ethereum · Mar 11, 2019 · 3f614e7 · 3f614e7
1 parent 7ca37c2
commit 3f614e7
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 28 deletions.
diff --git a/docs/web3.personal.rst b/docs/web3.personal.rst
@@ -142,8 +142,9 @@ The following methods are available on the ``web3.parity.personal`` namespace.
 
     .. code-block:: python
 
+        # Invalid call to personal_unlockAccount on Parity currently returns True, due to Parity bug
         >>> web3.parity.personal.unlockAccount('0xd3cda913deb6f67967b99d67acdfa1712c293601', 'wrong-passphrase')
-        False
+        True
         >>> web3.parity.personal.unlockAccount('0xd3cda913deb6f67967b99d67acdfa1712c293601', 'the-passphrase')
         True
 

diff --git a/tests/core/method-class/test_method.py b/tests/core/method-class/test_method.py
@@ -265,7 +265,7 @@ class FakeModule(ModuleV2):
 def dummy_w3():
     return Web3(
         EthereumTesterProvider(),
-        modules=[{'name': 'fake', 'module': FakeModule}],
+        modules={'fake': (FakeModule,)},
         middlewares=[])
 
 

diff --git a/tests/core/version-module/test_version_module.py b/tests/core/version-module/test_version_module.py
@@ -19,8 +19,8 @@ def blocking_w3():
     return Web3(
         EthereumTesterProvider(),
         modules=[
-            {"name": "blocking_version", "module": BlockingVersion},
-            {"name": "legacy_version", "module": Version},
+            {"blocking_version": (BlockingVersion,)},
+            {"legacy_version": (Version,)},
         ])
 
 
@@ -30,7 +30,7 @@ def async_w3():
         AsyncEthereumTesterProvider(),
         middlewares=[],
         modules=[
-            {"name": 'async_version', "module": AsyncVersion},
+            {'async_version': (AsyncVersion,)},
         ])
 
 

diff --git a/web3/_utils/module_testing/personal_module.py b/web3/_utils/module_testing/personal_module.py
@@ -112,6 +112,7 @@ def test_personal_unlockAccount_success(self,
         )
         assert result is True
 
+    # Seems to be an issue with Parity since this should return False
     def test_personal_unlockAccount_failure(self,
                                             web3,
                                             unlockable_account_dual_type):

diff --git a/web3/main.py b/web3/main.py
@@ -84,17 +84,17 @@
 
 
 def get_default_modules():
-    return [
-        {"name": "eth", "module": Eth},
-        {"name": "net", "module": Net},
-        {"name": "version", "module": Version},
-        {"name": "txpool", "module": TxPool},
-        {"name": "miner", "module": Miner},
-        {"name": "admin", "module": Admin},
-        {"name": "parity", "module": Parity, 'submodules': {'personal': ParityPersonal}},
-        {"name": "geth", "module": Geth, 'submodules': {'personal': GethPersonal}},
-        {"name": "testing", "module": Testing},
-    ]
+    return {
+        "eth": (Eth,),
+        "net": (Net,),
+        "version": (Version,),
+        "txpool": (TxPool,),
+        "miner": (Miner,),
+        "admin": (Admin,),
+        "parity": (Parity, {'personal': (ParityPersonal)}),
+        "geth": (Geth, {'personal': (GethPersonal)}),
+        "testing": (Testing,),
+    }
 
 
 class Web3:
@@ -133,10 +133,11 @@ def __init__(self, provider=None, middlewares=None, modules=None, ens=empty):
             modules = get_default_modules()
 
         for module in modules:
-            module['module'].attach(self, module['name'])
-            if 'submodules' in module:
-                for subname, submodule in module['submodules'].items():
-                    submodule.attach(getattr(self, module['name']), subname)
+            module_class, *submodules = modules[module]
+            module_class.attach(self, module)
+            if submodules:
+                for subname, submodule in submodules[0].items():
+                    submodule.attach(getattr(self, module, subname))
 
         self.ens = ens
 

diff --git a/web3/personal.py b/web3/personal.py
@@ -11,61 +11,53 @@ def importRawKey():
     return Method(
         "personal_importRawKey",
         mungers=[default_root_munger],
-        formatter_lookup_fn=None,
     )
 
 
 def newAccount():
     return Method(
         "personal_newAccount",
         mungers=[default_root_munger],
-        formatter_lookup_fn=None,
     )
 
 
 def listAccounts():
     return Method(
         "personal_listAccounts",
         mungers=None,
-        formatter_lookup_fn=None,
     )
 
 
 def sendTransaction():
     return Method(
         "personal_sendTransaction",
         mungers=[default_root_munger],
-        formatter_lookup_fn=None,
     )
 
 
 def lockAccount():
     return Method(
         "personal_lockAccount",
         mungers=[default_root_munger],
-        formatter_lookup_fn=None,
     )
 
 
 def unlockAccount():
     return Method(
         "personal_unlockAccount",
         mungers=[default_root_munger],
-        formatter_lookup_fn=None,
     )
 
 
 def sign():
     return Method(
         "personal_sign",
         mungers=[default_root_munger],
-        formatter_lookup_fn=None,
     )
 
 
 def ecRecover():
     return Method(
         "personal_ecRecover",
         mungers=[default_root_munger],
-        formatter_lookup_fn=None,
     )