From 6e7aae717dbeef2a964069adee6a8bf6a094191c Mon Sep 17 00:00:00 2001 From: Noel Maersk Date: Thu, 31 Oct 2019 14:07:00 +0200 Subject: [PATCH] setup,tests: use eth-typing v2.2.0 and fork definitions from it. --- setup.py | 2 +- tests/json-fixtures/test_transactions.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index c4bd57688a..c4e2907063 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ "cached-property>=1.5.1,<2", "eth-bloom>=1.0.3,<2.0.0", "eth-keys>=0.2.1,<0.3.0", - "eth-typing>=2.0.0,<3.0.0", + "eth-typing>=2.2.0,<3.0.0", "eth-utils>=1.7.0,<2.0.0", "lru-dict>=1.1.6", "mypy_extensions>=0.4.1,<1.0.0", diff --git a/tests/json-fixtures/test_transactions.py b/tests/json-fixtures/test_transactions.py index 53f37d4b98..4a6aa9c237 100644 --- a/tests/json-fixtures/test_transactions.py +++ b/tests/json-fixtures/test_transactions.py @@ -102,9 +102,9 @@ def fixture_transaction_class(fixture_data): return ByzantiumTransaction elif fork_name == ForkName.Constantinople: return ConstantinopleTransaction - elif fork_name == "ConstantinopleFix": + elif fork_name == ForkName.Petersburg: return PetersburgTransaction - elif fork_name == "Istanbul": + elif fork_name == ForkName.Istanbul: return IstanbulTransaction elif fork_name == ForkName.Metropolis: pytest.skip("Metropolis Transaction class has not been implemented")