move elfpy/bots into eth_bots/core

elfpy/bots/__init__.py

@@ -1,5 +0,0 @@
-"""Utilities and classes for Agent.0 bots"""
-
-from .agent_config import AgentConfig
-from .budget import Budget
-from .environment_config import DEFAULT_USERNAME, EnvironmentConfig

elfpy/bots/checkpoint_bot.py

@@ -11,12 +11,12 @@
 from web3.contract.contract import Contract
 
 from elfpy import eth
-from elfpy.bots.environment_config import EnvironmentConfig
 from elfpy.eth.accounts.eth_account import EthAgent
 from elfpy.eth.rpc_interface import set_anvil_account_balance
 from elfpy.eth.transactions import smart_contract_read, smart_contract_transact
 from elfpy.utils import logs
 from eth_bots import hyperdrive_interface
+from eth_bots.core import EnvironmentConfig
 
 # The portion of the checkpoint that the bot will wait before attempting to
 # mint a new checkpoint.

elfpy/eth/errors/__init__.py

@@ -0,0 +1,3 @@
+"""Custom error reporting and contract error parsing."""
+from .errors import decode_error_selector_for_contract
+from .types import ABIError, UnknownBlockError

elfpy/eth/errors/test_errors.py

@@ -1,7 +1,7 @@
 """Tests for errors.py"""
 import pytest
 
-from elfpy.eth.errors.errors import decode_error_selector_for_contract
+from elfpy.eth.errors import decode_error_selector_for_contract
 
 
 class TestDecodeErrorSelector:

eth_bots/core/__init__.py

@@ -0,0 +1,4 @@
+"""Core functions & utilities for running eth_bots"""
+from .agent_config import AgentConfig
+from .budget import Budget
+from .environment_config import DEFAULT_USERNAME, EnvironmentConfig

eth_bots/core/execute_agent_trades.py

@@ -13,7 +13,7 @@
 
 from elfpy import eth, types
 from elfpy.eth.accounts import EthAgent
-from elfpy.eth.errors.types import UnknownBlockError
+from elfpy.eth.errors import UnknownBlockError
 from elfpy.eth.transactions import smart_contract_preview_transaction
 from elfpy.markets.hyperdrive import HyperdriveMarket, MarketActionType
 from elfpy.markets.hyperdrive.hyperdrive_actions import HyperdriveMarketAction

eth_bots/core/get_agent_accounts.py

@@ -14,8 +14,8 @@
 from web3.contract.contract import Contract
 
 from elfpy import eth
-from elfpy.bots import AgentConfig
 from elfpy.eth.accounts import EthAgent
+from eth_bots.core import AgentConfig
 
 # pylint: disable=too-many-locals
 

eth_bots/core/setup_experiment.py

@@ -10,11 +10,10 @@
 from web3.contract.contract import Contract
 
 from elfpy import eth
-from elfpy.bots import DEFAULT_USERNAME, EnvironmentConfig
 from elfpy.eth.accounts import EthAgent
 from elfpy.utils import logs
 from eth_bots import hyperdrive_interface
-from eth_bots.core import crash_report
+from eth_bots.core import DEFAULT_USERNAME, EnvironmentConfig, crash_report
 from eth_bots.core.get_agent_accounts import get_agent_accounts
 from eth_bots.eth_bots_config import get_eth_bots_config
 

eth_bots/eth_bots_config.py

@@ -6,7 +6,7 @@
 from fixedpointmath import FixedPoint
 
 from elfpy.agents.policies import Policies
-from elfpy.bots import AgentConfig, Budget, EnvironmentConfig
+from eth_bots.core import AgentConfig, Budget, EnvironmentConfig
 
 # You can import custom policies here. For example:
 from eth_bots.custom_policies.example_custom_policy import ExampleCustomPolicy