Autumn cleaning part 3 - split transactron/core.py

coreblocks/utils/fifo.py

@@ -1,6 +1,5 @@
 from amaranth import *
-from transactron import Method, def_method, Priority, TModule
-from transactron._utils import MethodLayout
+from transactron import Method, def_method, Priority, TModule, MethodLayout
 from coreblocks.utils._typing import ValueLike
 
 

test/common.py

@@ -10,7 +10,8 @@
 from amaranth.sim import *
 from amaranth.sim.core import Command
 
-from transactron.core import SignalBundle, Method, TransactionModule
+from transactron.core import Method, TransactionModule
+from transactron.core.typing import SignalBundle
 from transactron.lib import AdapterBase, AdapterTrans
 from transactron._utils import method_def_helper
 from coreblocks.utils import ValueLike, HasElaborate, HasDebugSignals, auto_debug_signals, LayoutLike, ModuleConnector

test/transactions/test_transactions.py

@@ -15,12 +15,9 @@
 from transactron.lib import Adapter, AdapterTrans
 from transactron._utils import Scheduler
 
-from transactron.core import (
-    Priority,
-    TransactionScheduler,
-    trivial_roundrobin_cc_scheduler,
-    eager_deterministic_cc_scheduler,
-)
+from transactron.core import Priority
+from transactron.core.schedulers import trivial_roundrobin_cc_scheduler, eager_deterministic_cc_scheduler
+from transactron.core.typing import TransactionScheduler
 
 
 class TestNames(TestCase):

transactron/__init__.py

@@ -1,11 +1 @@
-from .core import *
-
-__all__ = [
-    "TModule",
-    "TransactionManager",
-    "TransactionContext",
-    "TransactionModule",
-    "Transaction",
-    "Method",
-    "def_method",
-]
+from .core import *  # noqa: F401

transactron/_utils.py

@@ -3,13 +3,11 @@
 from inspect import Parameter, signature
 from typing import Callable, Iterable, Optional, TypeAlias, TypeVar, Mapping
 from amaranth import *
-from coreblocks.utils._typing import LayoutLike
 from coreblocks.utils import OneHotSwitchDynamic
 
 __all__ = [
     "Scheduler",
     "_graph_ccs",
-    "MethodLayout",
     "ROGraph",
     "Graph",
     "GraphCC",
@@ -118,9 +116,6 @@ def _graph_ccs(gr: ROGraph[T]) -> list[GraphCC[T]]:
     return ccs
 
 
-MethodLayout: TypeAlias = LayoutLike
-
-
 def method_def_helper(method, func: Callable[..., T], arg=None, /, **kwargs) -> T:
     parameters = signature(func).parameters
     kw_parameters = set(