diff --git a/src/lean_spec/cli/run.py b/src/lean_spec/cli/run.py index ddac5cf3e..86065815d 100644 --- a/src/lean_spec/cli/run.py +++ b/src/lean_spec/cli/run.py @@ -22,9 +22,9 @@ from lean_spec.node.networking.client import LiveNetworkEventSource from lean_spec.node.networking.gossipsub import GossipTopic from lean_spec.node.node import Node, NodeConfig -from lean_spec.node.observability import set_observer from lean_spec.spec.forks import SubnetId from lean_spec.spec.forks.lstar.config import ATTESTATION_COMMITTEE_COUNT +from lean_spec.spec.observability import set_observer logger = logging.getLogger(__name__) diff --git a/src/lean_spec/spec/forks/lstar/fork_choice.py b/src/lean_spec/spec/forks/lstar/fork_choice.py index 1977237c8..c7e2bbcdd 100644 --- a/src/lean_spec/spec/forks/lstar/fork_choice.py +++ b/src/lean_spec/spec/forks/lstar/fork_choice.py @@ -3,10 +3,6 @@ import math from collections import defaultdict -from lean_spec.node.observability import ( - observe_on_attestation, - observe_on_block, -) from lean_spec.spec.crypto.merkleization import hash_tree_root from lean_spec.spec.crypto.xmss.interface import TARGET_SIGNATURE_SCHEME from lean_spec.spec.forks.lstar._base import LstarSpecBase, LstarStore @@ -30,6 +26,10 @@ ValidatorIndex, ) from lean_spec.spec.forks.protocol import SpecBlockType, SpecStateType +from lean_spec.spec.observability import ( + observe_on_attestation, + observe_on_block, +) from lean_spec.spec.ssz import Bytes32, Uint64 diff --git a/src/lean_spec/spec/forks/lstar/state_transition.py b/src/lean_spec/spec/forks/lstar/state_transition.py index d66b5d2ce..5209fca4b 100644 --- a/src/lean_spec/spec/forks/lstar/state_transition.py +++ b/src/lean_spec/spec/forks/lstar/state_transition.py @@ -4,9 +4,6 @@ from collections.abc import Iterable, Sequence from typing import Any -from lean_spec.node.observability import ( - observe_state_transition, -) from lean_spec.spec.crypto.merkleization import hash_tree_root from lean_spec.spec.forks.lstar._base import LstarSpecBase from lean_spec.spec.forks.lstar.containers import ( @@ -24,6 +21,9 @@ Validators, ) from lean_spec.spec.forks.protocol import SpecStateType +from lean_spec.spec.observability import ( + observe_state_transition, +) from lean_spec.spec.ssz import ZERO_HASH, Boolean, Bytes32, SSZList, Uint64 diff --git a/src/lean_spec/node/observability/__init__.py b/src/lean_spec/spec/observability/__init__.py similarity index 93% rename from src/lean_spec/node/observability/__init__.py rename to src/lean_spec/spec/observability/__init__.py index e2672b34f..9365efae4 100644 --- a/src/lean_spec/node/observability/__init__.py +++ b/src/lean_spec/spec/observability/__init__.py @@ -11,7 +11,7 @@ their own. """ -from lean_spec.node.observability.observer import ( +from lean_spec.spec.observability.observer import ( SpecObserver, observe_on_attestation, observe_on_block, diff --git a/src/lean_spec/node/observability/observer.py b/src/lean_spec/spec/observability/observer.py similarity index 100% rename from src/lean_spec/node/observability/observer.py rename to src/lean_spec/spec/observability/observer.py diff --git a/tests/lean_spec/node/observability/test_observer.py b/tests/lean_spec/spec/observability/test_observer.py similarity index 98% rename from tests/lean_spec/node/observability/test_observer.py rename to tests/lean_spec/spec/observability/test_observer.py index 6cc481f25..2d7d8a82e 100644 --- a/tests/lean_spec/node/observability/test_observer.py +++ b/tests/lean_spec/spec/observability/test_observer.py @@ -10,14 +10,14 @@ from prometheus_client import CollectorRegistry, Histogram from lean_spec.node.metrics import PrometheusObserver, registry as metrics -from lean_spec.node.observability import ( +from lean_spec.spec.observability import ( observe_on_attestation, observe_on_block, observe_state_transition, observer as observer_module, set_observer, ) -from lean_spec.node.observability.observer import _NullObserver +from lean_spec.spec.observability.observer import _NullObserver @pytest.fixture