Merge pull request #1709 from kclowes/remove-old-geth-versions

Remove old geth versions
ethereum · Aug 17, 2020 · 6a334ae · 6a334ae
2 parents b9d7677 + a59b358
commit 6a334ae
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 252 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -188,54 +188,6 @@ jobs:
       # Please don't use this key for any shenanigans
       WEB3_INFURA_PROJECT_ID: 7707850c2fb7465ebe6f150d67182e22
 
-  py36-integration-goethereum-ipc-1.7.2:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.6
-    environment:
-      TOXENV: py36-integration-goethereum-ipc
-      GETH_VERSION: v1.7.2
-
-  py36-integration-goethereum-http-1.7.2:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.6
-    environment:
-      TOXENV: py36-integration-goethereum-http
-      GETH_VERSION: v1.7.2
-
-  py36-integration-goethereum-ws-1.7.2:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.6
-    environment:
-      TOXENV: py36-integration-goethereum-ws
-      GETH_VERSION: v1.7.2
-
-  py36-integration-goethereum-ipc-1.8.22:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.6
-    environment:
-      TOXENV: py36-integration-goethereum-ipc
-      GETH_VERSION: v1.8.22
-
-  py36-integration-goethereum-http-1.8.22:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.6
-    environment:
-      TOXENV: py36-integration-goethereum-http
-      GETH_VERSION: v1.8.22
-
-  py36-integration-goethereum-ws-1.8.22:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.6
-    environment:
-      TOXENV: py36-integration-goethereum-ws
-      GETH_VERSION: v1.8.22
-
   py36-integration-goethereum-ipc-1.9.7:
     <<: *geth_steps
     docker:
@@ -326,54 +278,6 @@ jobs:
       # Please don't use this key for any shenanigans
       WEB3_INFURA_PROJECT_ID: 7707850c2fb7465ebe6f150d67182e22
 
-  py37-integration-goethereum-ipc-1.7.2:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-ipc
-      GETH_VERSION: v1.7.2
-
-  py37-integration-goethereum-http-1.7.2:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-http
-      GETH_VERSION: v1.7.2
-
-  py37-integration-goethereum-ws-1.7.2:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-ws
-      GETH_VERSION: v1.7.2
-
-  py37-integration-goethereum-ipc-1.8.22:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-ipc
-      GETH_VERSION: v1.8.22
-
-  py37-integration-goethereum-http-1.8.22:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-http
-      GETH_VERSION: v1.8.22
-
-  py37-integration-goethereum-ws-1.8.22:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-ws
-      GETH_VERSION: v1.8.22
-
   py37-integration-goethereum-ipc-1.9.7:
     <<: *geth_steps
     docker:
@@ -464,54 +368,6 @@ jobs:
       # Please don't use this key for any shenanigans
       WEB3_INFURA_PROJECT_ID: 7707850c2fb7465ebe6f150d67182e22
 
-  py38-integration-goethereum-ipc-1.7.2:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.8
-    environment:
-      TOXENV: py38-integration-goethereum-ipc
-      GETH_VERSION: v1.7.2
-
-  py38-integration-goethereum-http-1.7.2:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.8
-    environment:
-      TOXENV: py38-integration-goethereum-http
-      GETH_VERSION: v1.7.2
-
-  py38-integration-goethereum-ws-1.7.2:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.8
-    environment:
-      TOXENV: py38-integration-goethereum-ws
-      GETH_VERSION: v1.7.2
-
-  py38-integration-goethereum-ipc-1.8.22:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.8
-    environment:
-      TOXENV: py38-integration-goethereum-ipc
-      GETH_VERSION: v1.8.22
-
-  py38-integration-goethereum-http-1.8.22:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.8
-    environment:
-      TOXENV: py38-integration-goethereum-http
-      GETH_VERSION: v1.8.22
-
-  py38-integration-goethereum-ws-1.8.22:
-    <<: *geth_steps
-    docker:
-      - image: circleci/python:3.8
-    environment:
-      TOXENV: py38-integration-goethereum-ws
-      GETH_VERSION: v1.8.22
-
   py38-integration-goethereum-ipc-1.9.7:
     <<: *geth_steps
     docker:
@@ -591,12 +447,6 @@ workflows:
       - docs
       - py36-ens
       - py36-ethpm
-      - py36-integration-goethereum-ipc-1.7.2
-      - py36-integration-goethereum-http-1.7.2
-      - py36-integration-goethereum-ws-1.7.2
-      - py36-integration-goethereum-ipc-1.8.22
-      - py36-integration-goethereum-http-1.8.22
-      - py36-integration-goethereum-ws-1.8.22
       - py36-integration-goethereum-ipc-1.9.7
       - py36-integration-goethereum-http-1.9.7
       - py36-integration-goethereum-ws-1.9.7
@@ -607,12 +457,6 @@ workflows:
       - py36-wheel-cli
       - py37-ens
       - py37-ethpm
-      - py37-integration-goethereum-ipc-1.7.2
-      - py37-integration-goethereum-http-1.7.2
-      - py37-integration-goethereum-ws-1.7.2
-      - py37-integration-goethereum-ipc-1.8.22
-      - py37-integration-goethereum-http-1.8.22
-      - py37-integration-goethereum-ws-1.8.22
       - py37-integration-goethereum-ipc-1.9.7
       - py37-integration-goethereum-http-1.9.7
       - py37-integration-goethereum-ws-1.9.7
@@ -623,12 +467,6 @@ workflows:
       - py37-wheel-cli
       - py38-ens
       - py38-ethpm
-      - py38-integration-goethereum-ipc-1.7.2
-      - py38-integration-goethereum-http-1.7.2
-      - py38-integration-goethereum-ws-1.7.2
-      - py38-integration-goethereum-ipc-1.8.22
-      - py38-integration-goethereum-http-1.8.22
-      - py38-integration-goethereum-ws-1.8.22
       - py38-integration-goethereum-ipc-1.9.7
       - py38-integration-goethereum-http-1.9.7
       - py38-integration-goethereum-ws-1.9.7

diff --git a/.gitignore b/.gitignore
@@ -121,3 +121,6 @@ fabric.properties
 
 # pip wheel metadata
 pip-wheel-metadata/
+
+# jupyter notebook files
+*.ipynb
diff --git a/newsfragments/1709.misc.rst b/newsfragments/1709.misc.rst
@@ -0,0 +1 @@
+Remove 1.8 and 1.7 Geth tests, since the Geth team only supports the latest version.
diff --git a/setup.py b/setup.py
@@ -73,7 +73,7 @@
         "eth-account>=0.5.2,<0.6.0",
         "eth-hash[pycryptodome]>=0.2.0,<1.0.0",
         "eth-typing>=2.0.0,<3.0.0",
-        "eth-utils>=1.8.4,<2.0.0",
+        "eth-utils>=1.8.4,<1.9.1",
         "hexbytes>=0.1.0,<1.0.0",
         "ipfshttpclient>=0.4.13,<1",
         "jsonschema>=3.2.0,<4.0.0",

diff --git a/tests/integration/geth-1.8.22-fixture.zip b/tests/integration/geth-1.8.22-fixture.zip
diff --git a/tests/integration/geth-17-fixture.zip b/tests/integration/geth-17-fixture.zip
diff --git a/tests/integration/go_ethereum/common.py b/tests/integration/go_ethereum/common.py
@@ -10,8 +10,7 @@
     Web3ModuleTest,
 )
 
-VERSIONS_WITHOUT_MINING_CONTROL = ['v1.7.2', 'v1.8.22']
-VERSIONS_WITHOUT_ETH_SUBMITHASH = ['v1.8.22', 'v1.9.7']
+VERSIONS_WITHOUT_ETH_SUBMITHASH = ['v1.9.7']
 
 
 class GoEthereumTest(Web3ModuleTest):
@@ -20,44 +19,11 @@ def _check_web3_clientVersion(self, client_version):
 
 
 class GoEthereumEthModuleTest(EthModuleTest):
-    def test_eth_replaceTransaction(self, web3, unlocked_account):
-        if any([v in web3.clientVersion for v in VERSIONS_WITHOUT_MINING_CONTROL]):
-            pytest.xfail(reason='Needs ability to efficiently control mining')
-        super().test_eth_replaceTransaction(web3, unlocked_account)
-
     def test_eth_replaceTransaction_already_mined(self, web3, unlocked_account_dual_type):
         web3.geth.miner.start()
         super().test_eth_replaceTransaction_already_mined(web3, unlocked_account_dual_type)
         web3.geth.miner.stop()
 
-    def test_eth_replaceTransaction_gas_price_defaulting_minimum(self, web3, unlocked_account):
-        if any([v in web3.clientVersion for v in VERSIONS_WITHOUT_MINING_CONTROL]):
-            pytest.xfail(reason='Needs ability to efficiently control mining')
-        super().test_eth_replaceTransaction_gas_price_defaulting_minimum(web3, unlocked_account)
-
-    def test_eth_replaceTransaction_gas_price_defaulting_strategy_higher(self,
-                                                                         web3,
-                                                                         unlocked_account):
-        if any([v in web3.clientVersion for v in VERSIONS_WITHOUT_MINING_CONTROL]):
-            pytest.xfail(reason='Needs ability to efficiently control mining')
-        super().test_eth_replaceTransaction_gas_price_defaulting_strategy_higher(
-            web3, unlocked_account
-        )
-
-    def test_eth_replaceTransaction_gas_price_defaulting_strategy_lower(self,
-                                                                        web3,
-                                                                        unlocked_account):
-        if any([v in web3.clientVersion for v in VERSIONS_WITHOUT_MINING_CONTROL]):
-            pytest.xfail(reason='Needs ability to efficiently control mining')
-        super().test_eth_replaceTransaction_gas_price_defaulting_strategy_lower(
-            web3, unlocked_account
-        )
-
-    def test_eth_modifyTransaction(self, web3, unlocked_account):
-        if any([v in web3.clientVersion for v in VERSIONS_WITHOUT_MINING_CONTROL]):
-            pytest.xfail(reason='Needs ability to efficiently control mining')
-        super().test_eth_modifyTransaction(web3, unlocked_account)
-
     @pytest.mark.xfail(reason='Block identifier has not been implemented in geth')
     def test_eth_estimateGas_with_block(self,
                                         web3,
@@ -72,11 +38,6 @@ def test_eth_submitHashrate(self, web3):
             pytest.xfail('eth_submitHashrate deprecated in 1.8.22 for ethash_submitHashRate')
         super().test_eth_submitHashrate(web3)
 
-    def test_eth_chainId(self, web3):
-        if 'v1.7.2' in web3.clientVersion:
-            pytest.xfail('eth_chainId not implemented in geth 1.7.2')
-        super().test_eth_chainId(web3)
-
     @pytest.mark.xfail(reason='eth_signTypedData has not been released in geth')
     def test_eth_signTypedData(self,
                                web3,
@@ -103,35 +64,7 @@ class GoEthereumNetModuleTest(NetModuleTest):
 
 
 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_sync_filter_deprecated(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_deprecated(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_async_filter_deprecated(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_deprecated(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)
-
-    def test_shh_post_deprecated(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_deprecated(web3)
+    pass
 
 
 class GoEthereumAdminModuleTest(GoEthereumAdminModuleTest):

diff --git a/tests/integration/go_ethereum/conftest.py b/tests/integration/go_ethereum/conftest.py
@@ -19,8 +19,6 @@
 
 KEYFILE_PW = 'web3py-test'
 
-GETH_17_ZIP = 'geth-17-fixture.zip'
-GETH_1822_ZIP = 'geth-1.8.22-fixture.zip'
 GETH_197_ZIP = 'geth-1.9.7-fixture.zip'
 
 
@@ -71,13 +69,8 @@ def base_geth_command_arguments(geth_binary, datadir):
 
 @pytest.fixture(scope="module")
 def geth_zipfile_version(get_geth_version):
-    if get_geth_version.major == 1:
-        if get_geth_version.minor == 7:
-            return GETH_17_ZIP
-        elif get_geth_version.minor == 8:
-            return GETH_1822_ZIP
-        elif get_geth_version.minor == 9:
-            return GETH_197_ZIP
+    if get_geth_version.major == 1 and get_geth_version.minor == 9:
+        return GETH_197_ZIP
     raise AssertionError("Unsupported geth version")
 
 

diff --git a/tests/integration/go_ethereum/test_goethereum_http.py b/tests/integration/go_ethereum/test_goethereum_http.py
@@ -39,11 +39,8 @@ def _geth_command_arguments(rpc_port,
             '--rpcport', rpc_port,
             '--rpcapi', 'admin,db,eth,net,web3,personal,shh,miner',
             '--ipcdisable',
+            '--allow-insecure-unlock'
         )
-        if geth_version.minor == 9:
-            yield '--allow-insecure-unlock'
-        elif geth_version.minor not in [9, 8, 7]:
-            raise AssertionError("Unsupported Geth version")
     else:
         raise AssertionError("Unsupported Geth version")
 

diff --git a/tests/integration/go_ethereum/test_goethereum_ws.py b/tests/integration/go_ethereum/test_goethereum_ws.py
@@ -41,10 +41,9 @@ def _geth_command_arguments(ws_port,
             '--wsapi', 'admin,db,eth,net,shh,web3,personal,miner',
             '--wsorigins', '*',
             '--ipcdisable',
+            '--allow-insecure-unlock',
         )
-        if geth_version.minor == 9:
-            yield '--allow-insecure-unlock'
-        elif geth_version.minor not in [9, 8, 7]:
+        if geth_version.minor not in [9]:
             raise AssertionError("Unsupported Geth version")
     else:
         raise AssertionError("Unsupported Geth version")

diff --git a/web3/_utils/module_testing/shh_module.py b/web3/_utils/module_testing/shh_module.py
@@ -393,10 +393,7 @@ def test_shh_post_deprecated(self, web3: "Web3") -> None:
     #
     def test_shh_version(self, web3: "Web3") -> None:
         version = web3.geth.shh.version()
-        if '1.7' in web3.clientVersion:
-            assert version == '5.0'
-        else:
-            assert version == '6.0'
+        assert version == '6.0'
 
     def test_shh_info(self, web3: "Web3") -> None:
         pre_info = web3.geth.shh.info()