From 76457267087e93cc444e346f14090edfe696fbdb Mon Sep 17 00:00:00 2001 From: Luke Van Seters Date: Tue, 28 Sep 2021 12:50:50 -0400 Subject: [PATCH] Move classifier spec to its own schemas file --- mev_inspect/classifiers/specs/aave.py | 2 +- mev_inspect/classifiers/specs/balancer.py | 2 +- mev_inspect/classifiers/specs/curve.py | 2 +- mev_inspect/classifiers/specs/erc20.py | 2 +- mev_inspect/classifiers/specs/uniswap.py | 2 +- mev_inspect/classifiers/specs/weth.py | 2 +- mev_inspect/classifiers/specs/zero_ex.py | 6 ++---- mev_inspect/schemas/classified_traces.py | 9 --------- mev_inspect/schemas/classifier_specs.py | 12 ++++++++++++ 9 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 mev_inspect/schemas/classifier_specs.py diff --git a/mev_inspect/classifiers/specs/aave.py b/mev_inspect/classifiers/specs/aave.py index c12e785..5657273 100644 --- a/mev_inspect/classifiers/specs/aave.py +++ b/mev_inspect/classifiers/specs/aave.py @@ -1,6 +1,6 @@ +from mev_inspect.schemas.classifier_specs import ClassifierSpec from mev_inspect.schemas.classified_traces import ( Classification, - ClassifierSpec, Protocol, ) diff --git a/mev_inspect/classifiers/specs/balancer.py b/mev_inspect/classifiers/specs/balancer.py index 835d1bf..040d647 100644 --- a/mev_inspect/classifiers/specs/balancer.py +++ b/mev_inspect/classifiers/specs/balancer.py @@ -1,6 +1,6 @@ +from mev_inspect.schemas.classifier_specs import ClassifierSpec from mev_inspect.schemas.classified_traces import ( Classification, - ClassifierSpec, Protocol, ) diff --git a/mev_inspect/classifiers/specs/curve.py b/mev_inspect/classifiers/specs/curve.py index 79610f9..9ce4506 100644 --- a/mev_inspect/classifiers/specs/curve.py +++ b/mev_inspect/classifiers/specs/curve.py @@ -1,5 +1,5 @@ +from mev_inspect.schemas.classifier_specs import ClassifierSpec from mev_inspect.schemas.classified_traces import ( - ClassifierSpec, Protocol, ) diff --git a/mev_inspect/classifiers/specs/erc20.py b/mev_inspect/classifiers/specs/erc20.py index 02cd3ae..297fc53 100644 --- a/mev_inspect/classifiers/specs/erc20.py +++ b/mev_inspect/classifiers/specs/erc20.py @@ -1,6 +1,6 @@ +from mev_inspect.schemas.classifier_specs import ClassifierSpec from mev_inspect.schemas.classified_traces import ( Classification, - ClassifierSpec, ) diff --git a/mev_inspect/classifiers/specs/uniswap.py b/mev_inspect/classifiers/specs/uniswap.py index e6c9f5a..25819ce 100644 --- a/mev_inspect/classifiers/specs/uniswap.py +++ b/mev_inspect/classifiers/specs/uniswap.py @@ -1,6 +1,6 @@ +from mev_inspect.schemas.classifier_specs import ClassifierSpec from mev_inspect.schemas.classified_traces import ( Classification, - ClassifierSpec, Protocol, ) diff --git a/mev_inspect/classifiers/specs/weth.py b/mev_inspect/classifiers/specs/weth.py index df85790..d9faa0e 100644 --- a/mev_inspect/classifiers/specs/weth.py +++ b/mev_inspect/classifiers/specs/weth.py @@ -1,6 +1,6 @@ +from mev_inspect.schemas.classifier_specs import ClassifierSpec from mev_inspect.schemas.classified_traces import ( Classification, - ClassifierSpec, Protocol, ) diff --git a/mev_inspect/classifiers/specs/zero_ex.py b/mev_inspect/classifiers/specs/zero_ex.py index 4f47a03..8da3c15 100644 --- a/mev_inspect/classifiers/specs/zero_ex.py +++ b/mev_inspect/classifiers/specs/zero_ex.py @@ -1,7 +1,5 @@ -from mev_inspect.schemas.classified_traces import ( - ClassifierSpec, - Protocol, -) +from mev_inspect.schemas.classifier_specs import ClassifierSpec +from mev_inspect.schemas.classified_traces import Protocol ZEROX_CONTRACT_SPECS = [ diff --git a/mev_inspect/schemas/classified_traces.py b/mev_inspect/schemas/classified_traces.py index d50cb8b..e226edf 100644 --- a/mev_inspect/schemas/classified_traces.py +++ b/mev_inspect/schemas/classified_traces.py @@ -1,8 +1,6 @@ from enum import Enum from typing import Any, Dict, List, Optional -from pydantic import BaseModel - from .blocks import Trace @@ -64,10 +62,3 @@ class DecodedCallTrace(CallTrace): gas_used: Optional[int] function_name: Optional[str] function_signature: Optional[str] - - -class ClassifierSpec(BaseModel): - abi_name: str - protocol: Optional[Protocol] = None - valid_contract_addresses: Optional[List[str]] = None - classifications: Dict[str, Classification] = {} diff --git a/mev_inspect/schemas/classifier_specs.py b/mev_inspect/schemas/classifier_specs.py new file mode 100644 index 0000000..37703b5 --- /dev/null +++ b/mev_inspect/schemas/classifier_specs.py @@ -0,0 +1,12 @@ +from typing import Dict, List, Optional + +from pydantic import BaseModel + +from .classified_traces import Classification, Protocol + + +class ClassifierSpec(BaseModel): + abi_name: str + protocol: Optional[Protocol] = None + valid_contract_addresses: Optional[List[str]] = None + classifications: Dict[str, Classification] = {}