Relocate eth_protocolVersion and web3_clientVersion

tests/core/eth-module/test_eth_protocolVersion.py

@@ -0,0 +1,2 @@
+def test_eth_protocolVersion(web3):
+    assert web3.eth.protocolVersion == '99'

tests/core/version-module/test_version_module.py

@@ -36,8 +36,13 @@ def async_w3():
 
 def test_blocking_version(blocking_w3):
     assert blocking_w3.blocking_version.api == blocking_w3.legacy_version.api
-    assert blocking_w3.blocking_version.node == blocking_w3.legacy_version.node
-    assert blocking_w3.blocking_version.ethereum == blocking_w3.legacy_version.ethereum
+
+
+def test_legacy_version_deprecation(blocking_w3):
+    with pytest.raises(DeprecationWarning):
+        blocking_w3.legacy_version.node
+    with pytest.raises(DeprecationWarning):
+        blocking_w3.legacy_version.ethereum
 
 
 @pytest.mark.asyncio

tests/core/web3-module/test_clientVersion.py

@@ -0,0 +1,2 @@
+def test_web3_clientVersion(web3):
+    assert web3.clientVersion.startswith("EthereumTester/")

web3/_utils/module_testing/eth_module.py

@@ -31,7 +31,7 @@
 
 class EthModuleTest:
     def test_eth_protocolVersion(self, web3):
-        protocol_version = web3.version.ethereum
+        protocol_version = web3.eth.protocolVersion
 
         assert is_string(protocol_version)
         assert protocol_version.isdigit()

web3/_utils/module_testing/version_module.py

@@ -5,7 +5,7 @@
 
 class VersionModuleTest:
     def test_eth_protocolVersion(self, web3):
-        protocol_version = web3.version.ethereum
+        protocol_version = web3.eth.protocolVersion
 
         assert is_string(protocol_version)
         assert protocol_version.isdigit()

web3/_utils/module_testing/web3_module.py

@@ -15,7 +15,7 @@
 
 class Web3ModuleTest:
     def test_web3_clientVersion(self, web3):
-        client_version = web3.version.node
+        client_version = web3.clientVersion
         self._check_web3_clientVersion(client_version)
 
     def _check_web3_clientVersion(self, client_version):

web3/main.py

@@ -81,16 +81,12 @@
 from web3.txpool import (
     TxPool,
 )
-from web3.version import (
-    Version,
-)
 
 
 def get_default_modules():
     return {
         "eth": (Eth,),
         "net": (Net,),
-        "version": (Version,),
         "txpool": (TxPool,),
         "miner": (Miner,),
         "admin": (Admin,),
@@ -155,6 +151,10 @@ def provider(self):
     def provider(self, provider):
         self.manager.provider = provider
 
+    @property
+    def clientVersion(self):
+        return self.manager.request_blocking("web3_clientVersion", [])
+
     @staticmethod
     @apply_to_return_value(HexBytes)
     def keccak(primitive=None, text=None, hexstr=None):

web3/middleware/normalize_errors.py

@@ -13,7 +13,7 @@ def middleware(method, params):
         # It used to return a result of None, so we simulate the old behavior.
 
         if method == 'eth_getTransactionReceipt' and 'error' in result:
-            is_geth = web3.version.node.startswith('Geth')
+            is_geth = web3.clientVersion.startswith('Geth')
             if is_geth and result['error']['code'] == -32000:
                 return assoc(
                     dissoc(result, 'error'),

web3/version.py

@@ -49,8 +49,8 @@ def api(self):
 
     @property
     def node(self):
-        return self.web3.manager.request_blocking("web3_clientVersion", [])
+        raise DeprecationWarning("This method has been deprecated as of EIP 1474.")
 
     @property
     def ethereum(self):
-        return self.web3.manager.request_blocking("eth_protocolVersion", [])
+        raise DeprecationWarning("This method has been deprecated as of EIP 1474.")