Minor adjustments from updated dependencies

Author: njgheorghita

tests/core/pm-module/conftest.py

@@ -24,9 +24,6 @@
 from pytest_ethereum.deployer import (
     Deployer,
 )
-from pytest_ethereum.plugins import (
-    twig_manifest,
-)
 
 from web3 import Web3
 from web3.pm import (
@@ -173,7 +170,7 @@ def sol_registry(w3):
 
 def vy_registry(w3):
     registry_path = ASSETS_DIR / "vyper_registry"
-    manifest = twig_manifest(registry_path, "registry", "1.0.0")
+    manifest = json.loads((registry_path / "1.0.0.json").read_text().rstrip('\n'))
     registry_package = Package(manifest, w3)
     registry_deployer = Deployer(registry_package)
     deployed_registry_package = registry_deployer.deploy("registry")

tests/core/pm-module/test_ens_integration.py

@@ -26,14 +26,11 @@ def bytes32(val):
     return result.rjust(32, b'\0')
 
 
-pytest_plugins = ["pytest_ethereum.plugins"]
-
-
 @pytest.fixture
-def ens_setup(solc_deployer):
+def ens_setup(deployer):
     # todo: move to module level once ethpm alpha stable
     ENS_MANIFEST = ASSETS_DIR / 'ens' / '1.0.1.json'
-    ens_deployer = solc_deployer(ENS_MANIFEST)
+    ens_deployer = deployer(ENS_MANIFEST)
     w3 = ens_deployer.package.w3
 
     # ** Set up ENS contracts **

tests/core/providers/test_websocket_provider.py

@@ -7,11 +7,11 @@
     Thread,
 )
 
+import websockets
+
 from tests.utils import (
     wait_for_ws,
 )
-import websockets
-
 from web3 import Web3
 from web3.exceptions import (
     ValidationError,

tests/generate_go_ethereum_fixture.py

@@ -21,10 +21,10 @@
     to_text,
     to_wei,
 )
+
 from tests.utils import (
     get_open_port,
 )
-
 from web3 import Web3
 from web3._utils.module_testing.emitter_contract import (
     EMITTER_ABI,

tests/integration/generate_fixtures/go_ethereum.py

@@ -9,11 +9,11 @@
     is_dict,
     is_same_address,
 )
+
+import common
 from tests.utils import (
     get_open_port,
 )
-
-import common
 from web3 import Web3
 from web3._utils.module_testing.emitter_contract import (
     EMITTER_ABI,

tests/integration/generate_fixtures/parity.py

@@ -9,12 +9,12 @@
 from eth_utils import (
     to_text,
 )
-from tests.utils import (
-    get_open_port,
-)
 
 import common
 import go_ethereum
+from tests.utils import (
+    get_open_port,
+)
 from web3 import Web3
 from web3._utils.toolz import (
     merge,

tests/integration/go_ethereum/test_goethereum_http.py

@@ -3,7 +3,6 @@
 from tests.utils import (
     get_open_port,
 )
-
 from web3 import Web3
 
 from .common import (

tests/integration/go_ethereum/test_goethereum_ipc.py

@@ -5,7 +5,6 @@
 from tests.utils import (
     get_open_port,
 )
-
 from web3 import Web3
 
 from .common import (

tests/integration/go_ethereum/test_goethereum_ws.py

@@ -7,7 +7,6 @@
     get_open_port,
     wait_for_ws,
 )
-
 from web3 import Web3
 
 from .common import (

tests/integration/parity/test_parity_http.py

@@ -7,7 +7,6 @@
 from tests.utils import (
     get_open_port,
 )
-
 from web3 import Web3
 from web3._utils.module_testing import (
     NetModuleTest,

tests/integration/parity/test_parity_ipc.py

@@ -5,7 +5,6 @@
 from tests.integration.parity.utils import (
     wait_for_socket,
 )
-
 from web3 import Web3
 from web3._utils.module_testing import (
     NetModuleTest,

tests/integration/parity/test_parity_ws.py

@@ -8,7 +8,6 @@
     get_open_port,
     wait_for_ws,
 )
-
 from web3 import Web3
 from web3._utils.module_testing import (
     NetModuleTest,

web3/pm.py

@@ -419,7 +419,7 @@ def set_registry(self, address: Address) -> None:
             self.registry = VyperReferenceRegistry(canonical_address, self.web3)
         elif is_ens_name(address):
             self._validate_set_ens()
-            addr_lookup = self.web3.ens.address(address, guess_tld=False)
+            addr_lookup = self.web3.ens.address(address)
             if not addr_lookup:
                 raise NameNotFound(
                     "No address found after ENS lookup for name: {0}.".format(address)