bugfixes

delvtech · Oct 9, 2023 · 22aa2d0 · 22aa2d0
1 parent 375f0d8
commit 22aa2d0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 16 deletions.
diff --git a/lib/ethpy/ethpy/hyperdrive/api_test.py b/lib/ethpy/ethpy/hyperdrive/api_test.py
@@ -1,4 +1,7 @@
 """Tests for hyperdrive/api.py"""
+# fixtures require redefining the import name and unused import
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-import
 from __future__ import annotations
 
 from typing import cast
@@ -11,8 +14,6 @@
 from fixedpointmath import FixedPoint
 from web3 import HTTPProvider
 
-# pylint: disable=too-many-locals
-
 
 class TestHyperdriveInterface:
     """Tests for the HyperdriveInterface api class."""
@@ -68,10 +69,11 @@ def test_spot_price_and_fixed_rate(self, local_hyperdrive_pool: DeployedHyperdri
         """
         uri: URI | None = cast(HTTPProvider, local_hyperdrive_pool.web3.provider).endpoint_uri
         rpc_uri = uri if uri else URI("http://localhost:8545")
-        abi_dir = "./packages/hyperdrive/src/abis"
         hyperdrive_contract_addresses: HyperdriveAddresses = local_hyperdrive_pool.hyperdrive_contract_addresses
-        eth_config = EthConfig(artifacts_uri="not used", rpc_uri=rpc_uri, abi_dir=abi_dir)
-        hyperdrive = HyperdriveInterface(eth_config, addresses=hyperdrive_contract_addresses)
+        hyperdrive = HyperdriveInterface(
+            eth_config=EthConfig(artifacts_uri="not used", rpc_uri=rpc_uri, abi_dir="./packages/hyperdrive/src/abis"),
+            addresses=hyperdrive_contract_addresses,
+        )
         # get pool config variables
         pool_config = hyperdrive.pool_config
         init_share_price: FixedPoint = pool_config["initialSharePrice"]

diff --git a/lib/ethpy/ethpy/hyperdrive/interface_test.py b/lib/ethpy/ethpy/hyperdrive/interface_test.py
@@ -1,4 +1,7 @@
 """Tests for hyperdrive/api.py"""
+# fixtures require redefining the import name and unused import
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-import
 from __future__ import annotations
 
 from typing import cast

diff --git a/tests/bot_load_state_test.py b/tests/bot_load_state_test.py
@@ -109,7 +109,7 @@ class TestBotToDb:
     # pylint: disable=too-many-locals, too-many-statements
     def test_bot_to_db(
         self,
-        local_hyperdrive_chain: DeployedHyperdrivePool,
+        local_hyperdrive_pool: DeployedHyperdrivePool,
         db_session: Session,
         db_api: str,
     ):
@@ -120,9 +120,9 @@ def test_bot_to_db(
         os.environ["DEVELOP"] = "true"
 
         # Get hyperdrive chain info
-        uri: URI | None = cast(HTTPProvider, local_hyperdrive_chain.web3.provider).endpoint_uri
+        uri: URI | None = cast(HTTPProvider, local_hyperdrive_pool.web3.provider).endpoint_uri
         rpc_uri = uri if uri else URI("http://localhost:8545")
-        hyperdrive_contract_addresses: HyperdriveAddresses = local_hyperdrive_chain.hyperdrive_contract_addresses
+        hyperdrive_contract_addresses: HyperdriveAddresses = local_hyperdrive_pool.hyperdrive_contract_addresses
 
         # Build environment config
         env_config = EnvironmentConfig(

diff --git a/tests/bot_to_db_test.py b/tests/bot_to_db_test.py
@@ -43,7 +43,7 @@ class TestBotToDb:
     # pylint: disable=too-many-locals, too-many-statements
     def test_bot_to_db(
         self,
-        local_hyperdrive_chain: DeployedHyperdrivePool,
+        local_hyperdrive_pool: DeployedHyperdrivePool,
         cycle_trade_policy: Type[BasePolicy],
         db_session: Session,
         db_api: str,
@@ -54,10 +54,10 @@ def test_bot_to_db(
         # Run this test with develop mode on
         os.environ["DEVELOP"] = "true"
         # Get hyperdrive chain info
-        uri: URI | None = cast(HTTPProvider, local_hyperdrive_chain.web3.provider).endpoint_uri
+        uri: URI | None = cast(HTTPProvider, local_hyperdrive_pool.web3.provider).endpoint_uri
         rpc_uri = uri if uri else URI("http://localhost:8545")
-        deploy_account: LocalAccount = local_hyperdrive_chain.deploy_account
-        hyperdrive_contract_addresses: HyperdriveAddresses = local_hyperdrive_chain.hyperdrive_contract_addresses
+        deploy_account: LocalAccount = local_hyperdrive_pool.deploy_account
+        hyperdrive_contract_addresses: HyperdriveAddresses = local_hyperdrive_pool.hyperdrive_contract_addresses
 
         # Build environment config
         env_config = EnvironmentConfig(

diff --git a/tests/multi_trade_per_block_test.py b/tests/multi_trade_per_block_test.py
@@ -116,14 +116,14 @@ class TestMultiTradePerBlock:
     # pylint: disable=too-many-locals, too-many-statements
     def test_bot_to_db(
         self,
-        local_hyperdrive_chain: DeployedHyperdrivePool,
+        local_hyperdrive_pool: DeployedHyperdrivePool,
         db_session: Session,
         db_api: str,
     ):
         """Runs the entire pipeline and checks the database at the end.
         All arguments are fixtures.
         """
-        # TODO local_hyperdrive_chain is currently being run with automining. Hence, multiple trades
+        # TODO local_hyperdrive_pool is currently being run with automining. Hence, multiple trades
         # per block can't be tested until we can parameterize anvil running without automining.
         # For now, this is simply testing that the introduction of async trades doesn't break
         # when automining.
@@ -132,9 +132,9 @@ def test_bot_to_db(
         os.environ["DEVELOP"] = "true"
 
         # Get hyperdrive chain info
-        uri: URI | None = cast(HTTPProvider, local_hyperdrive_chain.web3.provider).endpoint_uri
+        uri: URI | None = cast(HTTPProvider, local_hyperdrive_pool.web3.provider).endpoint_uri
         rpc_uri = uri if uri else URI("http://localhost:8545")
-        hyperdrive_contract_addresses: HyperdriveAddresses = local_hyperdrive_chain.hyperdrive_contract_addresses
+        hyperdrive_contract_addresses: HyperdriveAddresses = local_hyperdrive_pool.hyperdrive_contract_addresses
 
         # Build environment config
         env_config = EnvironmentConfig(