From d4d2fb03594e3a8c193038faf6e594a45699d522 Mon Sep 17 00:00:00 2001 From: Patrick Daly Date: Sat, 31 Jul 2021 14:03:11 -0700 Subject: [PATCH] consolidating classifier related modules --- mev_inspect/classifiers/specs/__init__.py | 4 ++++ .../curve_traces.py => classifiers/specs/curve.py} | 2 +- .../{classifier_specs.py => classifiers/specs/uniswap.py} | 2 +- mev_inspect/{trace_classifier.py => classifiers/trace.py} | 0 scripts/inspect_block.py | 8 ++++---- 5 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 mev_inspect/classifiers/specs/__init__.py rename mev_inspect/{models/curve_traces.py => classifiers/specs/curve.py} (99%) rename mev_inspect/{classifier_specs.py => classifiers/specs/uniswap.py} (99%) rename mev_inspect/{trace_classifier.py => classifiers/trace.py} (100%) diff --git a/mev_inspect/classifiers/specs/__init__.py b/mev_inspect/classifiers/specs/__init__.py new file mode 100644 index 0000000..c185033 --- /dev/null +++ b/mev_inspect/classifiers/specs/__init__.py @@ -0,0 +1,4 @@ +from .uniswap import UNISWAP_CLASSIFIER_SPECS +from .curve import CURVE_CLASSIFIER_SPECS + +ALL_CLASSIFIER_SPECS = UNISWAP_CLASSIFIER_SPECS + CURVE_CLASSIFIER_SPECS diff --git a/mev_inspect/models/curve_traces.py b/mev_inspect/classifiers/specs/curve.py similarity index 99% rename from mev_inspect/models/curve_traces.py rename to mev_inspect/classifiers/specs/curve.py index a007640..9c3f6db 100644 --- a/mev_inspect/models/curve_traces.py +++ b/mev_inspect/classifiers/specs/curve.py @@ -241,4 +241,4 @@ CURVE_LIQUIDITY_GAUGES = [ ), ] -CLASSIFIER_SPECS = [*CURVE_BASE_POOLS, *CURVE_META_POOLS, *CURVE_LIQUIDITY_GAUGES] +CURVE_CLASSIFIER_SPECS = [*CURVE_BASE_POOLS, *CURVE_META_POOLS, *CURVE_LIQUIDITY_GAUGES] diff --git a/mev_inspect/classifier_specs.py b/mev_inspect/classifiers/specs/uniswap.py similarity index 99% rename from mev_inspect/classifier_specs.py rename to mev_inspect/classifiers/specs/uniswap.py index 4f7a961..166d453 100644 --- a/mev_inspect/classifier_specs.py +++ b/mev_inspect/classifiers/specs/uniswap.py @@ -118,7 +118,7 @@ WETH_SPEC = ClassifierSpec( ) -CLASSIFIER_SPECS = [ +UNISWAP_CLASSIFIER_SPECS = [ *UNISWAP_V3_CONTRACT_SPECS, *UNISWAPPY_V2_CONTRACT_SPECS, WETH_SPEC, diff --git a/mev_inspect/trace_classifier.py b/mev_inspect/classifiers/trace.py similarity index 100% rename from mev_inspect/trace_classifier.py rename to mev_inspect/classifiers/trace.py diff --git a/scripts/inspect_block.py b/scripts/inspect_block.py index 278b06a..8536415 100644 --- a/scripts/inspect_block.py +++ b/scripts/inspect_block.py @@ -8,10 +8,10 @@ from mev_inspect.crud.classified_traces import ( delete_classified_traces_for_block, write_classified_traces, ) -from mev_inspect.db import get_session -from mev_inspect.classifier_specs import CLASSIFIER_SPECS -from mev_inspect.trace_classifier import TraceClassifier from mev_inspect.arbitrage import get_arbitrages +from mev_inspect.classifiers.specs import ALL_CLASSIFIER_SPECS +from mev_inspect.classifiers.trace import TraceClassifier +from mev_inspect.db import get_session from mev_inspect.swaps import get_swaps @@ -32,7 +32,7 @@ def inspect_block(block_number: int, rpc: str): ) print(f"Total transactions: {total_transactions}") - trace_clasifier = TraceClassifier(CLASSIFIER_SPECS) + trace_clasifier = TraceClassifier(ALL_CLASSIFIER_SPECS) classified_traces = trace_clasifier.classify(block_data.traces) print(f"Returned {len(classified_traces)} classified traces")