Update shh integration tests

Author: njgheorghita

docs/web3.shh.rst

@@ -7,9 +7,13 @@ SHH API
 The ``web3.shh`` object exposes methods to interact with the RPC APIs under the
 ``shh_`` namespace.
 
+Web3.py exposes select Whisper methods under the ``web3.geth`` and ``web3.parity`` 
+namespaces to interact with the Whisper RPC API based on which endpoints are 
+supported by each respective client.
+
+
 .. warning:: The Whisper protocol is in flux, with incompatible versions supported
-    by different major clients. So it is not currently included by default in the web3
-    instance.
+    by different major clients.
 
 
 Properties

tests/core/shh-module/conftest.py

@@ -1,10 +0,0 @@
-import pytest
-
-from web3.shh import (
-    Shh,
-)
-
-
-@pytest.fixture(autouse=True)
-def include_shh_module(web3):
-    Shh.attach(web3, "shh")

tests/integration/go_ethereum/common.py

@@ -3,6 +3,7 @@
 from web3._utils.module_testing import (  # noqa: F401
     EthModuleTest,
     GoEthereumPersonalModuleTest,
+    GoEthereumShhModuleTest,
     NetModuleTest,
     VersionModuleTest,
     Web3ModuleTest,
@@ -62,7 +63,7 @@ def test_eth_estimateGas_with_block(self,
     def test_eth_submitHashrate(self, web3):
         if 'v1.8.22' in web3.clientVersion:
             # https://github.com/ethereum/go-ethereum/commit/51db5975cc5fb88db6a0dba1826b534fd4df29d7
-            pytest.xfail('eth_submitHashrate depracated in v1.8.22 for ethash_submitHashRate')
+            pytest.xfail('eth_submitHashrate deprecated in 1.8.22 for ethash_submitHashRate')
         super().test_eth_submitHashrate(web3)
 
     def test_eth_chainId(self, web3):
@@ -77,3 +78,20 @@ class GoEthereumVersionModuleTest(VersionModuleTest):
 
 class GoEthereumNetModuleTest(NetModuleTest):
     pass
+
+
+class CommonGoEthereumShhModuleTest(GoEthereumShhModuleTest):
+    def test_shh_sync_filter(self, web3):
+        if 'v1.7.2' in web3.clientVersion:
+            pytest.xfail('Whisper version 6 not supported in geth 1.7.2')
+        super().test_shh_sync_filter(web3)
+
+    def test_shh_async_filter(self, web3):
+        if 'v1.7.2' in web3.clientVersion:
+            pytest.xfail('Whisper version 6 not supported in geth 1.7.2')
+        super().test_shh_async_filter(web3)
+
+    def test_shh_post(self, web3):
+        if 'v1.7.2' in web3.clientVersion:
+            pytest.xfail('Whisper version 6 not supported in geth 1.7.2')
+        super().test_shh_post(web3)

tests/integration/go_ethereum/test_goethereum_http.py

@@ -6,6 +6,7 @@
 from web3 import Web3
 
 from .common import (
+    CommonGoEthereumShhModuleTest,
     GoEthereumEthModuleTest,
     GoEthereumNetModuleTest,
     GoEthereumPersonalModuleTest,
@@ -32,11 +33,12 @@ def geth_command_arguments(geth_binary, datadir, rpc_port):
     return (
         geth_binary,
         '--datadir', str(datadir),
+        '--shh',
         '--nodiscover',
         '--fakepow',
         '--rpc',
         '--rpcport', rpc_port,
-        '--rpcapi', 'db,eth,net,web3,personal,web3',
+        '--rpcapi', 'db,eth,net,web3,personal,shh,web3',
         '--ipcdisable',
     )
 
@@ -66,3 +68,7 @@ class TestGoEthereumNetModuleTest(GoEthereumNetModuleTest):
 
 class TestGoEthereumPersonalModuleTest(GoEthereumPersonalModuleTest):
     pass
+
+
+class TestGoEthereumShhModuleTest(CommonGoEthereumShhModuleTest):
+    pass

tests/integration/go_ethereum/test_goethereum_ipc.py

@@ -8,6 +8,7 @@
 from web3 import Web3
 
 from .common import (
+    CommonGoEthereumShhModuleTest,
     GoEthereumEthModuleTest,
     GoEthereumNetModuleTest,
     GoEthereumPersonalModuleTest,
@@ -26,6 +27,7 @@ def geth_command_arguments(geth_binary, datadir, geth_ipc_path):
         geth_binary,
         '--datadir', str(datadir),
         '--ipcpath', geth_ipc_path,
+        '--shh',
         '--nodiscover',
         '--fakepow',
         '--port', geth_port,
@@ -67,3 +69,7 @@ class TestGoEthereumNetModuleTest(GoEthereumNetModuleTest):
 
 class TestGoEthereumPersonalModuleTest(GoEthereumPersonalModuleTest):
     pass
+
+
+class TestGoEthereumShhModuleTest(CommonGoEthereumShhModuleTest):
+    pass

tests/integration/go_ethereum/test_goethereum_ws.py

@@ -10,6 +10,7 @@
 from web3 import Web3
 
 from .common import (
+    CommonGoEthereumShhModuleTest,
     GoEthereumEthModuleTest,
     GoEthereumNetModuleTest,
     GoEthereumPersonalModuleTest,
@@ -36,8 +37,9 @@ def geth_command_arguments(geth_binary, datadir, ws_port):
         '--nodiscover',
         '--fakepow',
         '--ws',
+        '--shh',
         '--wsport', ws_port,
-        '--wsapi', 'db,eth,net,web3,personal,web3',
+        '--wsapi', 'db,eth,net,shh,web3,personal,web3',
         '--wsorigins', '*',
         '--ipcdisable',
     )
@@ -72,3 +74,9 @@ class TestGoEthereumPersonalModuleTest(GoEthereumPersonalModuleTest):
 
 class TestMiscWebsocketTest(MiscWebsocketTest):
     pass
+
+
+class TestGoEthereumShhModuleTest(CommonGoEthereumShhModuleTest):
+    def test_shh_async_filter(self, web3):
+        pytest.xfail("async filter bug in geth ws version")
+        super().test_shh_async_filter(web3)

tests/integration/parity/common.py

@@ -13,6 +13,9 @@
 from web3._utils.module_testing.eth_module import (
     UNKNOWN_ADDRESS,
 )
+from web3._utils.module_testing.shh_module import (
+    ParityShhModuleTest,
+)
 
 # some tests appear flaky with Parity v1.10.x
 MAX_FLAKY_RUNS = 3
@@ -167,36 +170,14 @@ def test_eth_getLogs_without_logs(self, web3, block_with_txn_with_log):
 
 
 class ParityTraceModuleTest(TraceModuleTest):
-    def test_list_storage_keys_no_support(self, web3, emitter_contract_address):
-        super().test_list_storage_keys_no_support(web3, emitter_contract_address)
-
-    def test_trace_replay_transaction(self, web3, parity_fixture_data):
-        super().test_trace_replay_transaction(web3, parity_fixture_data)
-
-    def test_trace_replay_block_with_transactions(self,
-                                                  web3,
-                                                  block_with_txn,
-                                                  parity_fixture_data):
-        pytest.xfail('This method does not exist in older parity versions')
-        super().test_trace_replay_block_with_transactions(web3,
-                                                          block_with_txn,
-                                                          parity_fixture_data)
-
-    def test_trace_replay_block_without_transactions(self, web3, empty_block):
-        pytest.xfail('This method does not exist in older parity versions')
-        super().test_trace_replay_block_without_transactions(web3, empty_block)
-
-    def test_trace_block(self, web3, block_with_txn):
-        super().test_trace_block(web3, block_with_txn)
-
-    def test_trace_transaction(self, web3, parity_fixture_data):
-        super().test_trace_transaction(web3, parity_fixture_data)
+    pass
 
-    def test_trace_call(self, web3, math_contract, math_contract_address):
-        super().test_trace_call(web3, math_contract, math_contract_address)
 
-    def test_eth_call_with_0_result(self, web3, math_contract, math_contract_address):
-        super().test_eth_call_with_0_result(web3, math_contract, math_contract_address)
+class CommonParityShhModuleTest(ParityShhModuleTest):
+    def test_shh_sync_filter(self, web3):
+        pytest.xfail("Skip until parity filter bug is resolved")
+        super().test_shh_sync_filter(web3)
 
-    def test_trace_filter(self, web3, txn_filter_params, parity_fixture_data):
-        super().test_trace_filter(web3, txn_filter_params, parity_fixture_data)
+    def test_shh_async_filter(self, web3):
+        pytest.xfail("Skip until parity filter bug is resolved")
+        super().test_shh_async_filter(web3)

tests/integration/parity/test_parity_http.py

@@ -14,6 +14,7 @@
 )
 
 from .common import (
+    CommonParityShhModuleTest,
     ParityEthModuleTest,
     ParityPersonalModuleTest,
     ParityTraceModuleTest,
@@ -50,6 +51,7 @@ def parity_command_arguments(
         '--jsonrpc-apis', 'all',
         '--no-ipc',
         '--no-ws',
+        '--whisper',
     )
 
 
@@ -98,3 +100,7 @@ class TestParityPersonalModuleTest(ParityPersonalModuleTest):
 
 class TestParityTraceModuleTest(ParityTraceModuleTest):
     pass
+
+
+class TestParityShhModuleTest(CommonParityShhModuleTest):
+    pass

tests/integration/parity/test_parity_ipc.py

@@ -12,6 +12,7 @@
 )
 
 from .common import (
+    CommonParityShhModuleTest,
     ParityEthModuleTest,
     ParityPersonalModuleTest,
     ParityTraceModuleTest,
@@ -48,6 +49,7 @@ def parity_command_arguments(
         '--ipc-apis', 'all',
         '--no-jsonrpc',
         '--no-ws',
+        '--whisper',
     )
 
 
@@ -96,3 +98,7 @@ class TestParityPersonalModuleTest(ParityPersonalModuleTest):
 
 class TestParityTraceModuleTest(ParityTraceModuleTest):
     pass
+
+
+class TestParityShhModuleTest(CommonParityShhModuleTest):
+    pass

tests/integration/parity/test_parity_ws.py

@@ -15,6 +15,7 @@
 )
 
 from .common import (
+    CommonParityShhModuleTest,
     ParityEthModuleTest,
     ParityPersonalModuleTest,
     ParityTraceModuleTest,
@@ -52,6 +53,7 @@ def parity_command_arguments(
         '--ws-apis', 'all',
         '--no-ipc',
         '--no-jsonrpc',
+        '--whisper',
     )
 
 
@@ -105,3 +107,7 @@ class TestParityTraceModuleTest(ParityTraceModuleTest):
 
 class TestMiscWebsocketTest(MiscWebsocketTest):
     pass
+
+
+class TestParityShhModuleTest(CommonParityShhModuleTest):
+    pass