Rename sugar to method_mock

kuznia-rdzeni · Nov 13, 2024 · 63d1bd5 · 63d1bd5
1 parent 3a98e42
commit 63d1bd5
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 11 deletions.
diff --git a/test/cache/test_icache.py b/test/cache/test_icache.py
@@ -18,7 +18,7 @@
 
 from transactron.testing import TestCaseWithSimulator, TestbenchIO, async_def_method_mock
 from transactron.testing.functions import MethodData
-from transactron.testing.sugar import MethodMock
+from transactron.testing.method_mock import MethodMock
 from transactron.testing.testbenchio import CallTrigger
 from ..peripherals.test_wishbone import WishboneInterfaceWrapper
 

diff --git a/test/frontend/test_fetch.py b/test/frontend/test_fetch.py
@@ -11,7 +11,7 @@
 
 from transactron.core import Method
 from transactron.lib import AdapterTrans, Adapter, BasicFifo
-from transactron.testing.sugar import MethodMock
+from transactron.testing.method_mock import MethodMock
 from transactron.utils import ModuleConnector
 from transactron.testing import (
     TestCaseWithSimulator,

diff --git a/test/func_blocks/lsu/test_dummylsu.py b/test/func_blocks/lsu/test_dummylsu.py
@@ -4,7 +4,7 @@
 from amaranth_types.types import TestbenchContext
 
 from transactron.lib import Adapter
-from transactron.testing.sugar import MethodMock
+from transactron.testing.method_mock import MethodMock
 from transactron.utils import int_to_signed, signed_to_int
 from coreblocks.params import GenParams
 from coreblocks.func_blocks.fu.lsu.dummyLsu import LSUDummy

diff --git a/test/func_blocks/lsu/test_pma.py b/test/func_blocks/lsu/test_pma.py
@@ -8,7 +8,7 @@
 from coreblocks.params.configurations import test_core_config
 from coreblocks.arch import *
 from coreblocks.interface.keys import CoreStateKey, ExceptionReportKey, InstructionPrecommitKey
-from transactron.testing.sugar import MethodMock
+from transactron.testing.method_mock import MethodMock
 from transactron.utils.dependencies import DependencyContext
 from coreblocks.interface.layouts import ExceptionRegisterLayouts, RetirementLayouts
 from coreblocks.peripherals.wishbone import *

diff --git a/test/scheduler/test_rs_selection.py b/test/scheduler/test_rs_selection.py
@@ -13,7 +13,7 @@
 from transactron.lib import FIFO, Adapter, AdapterTrans
 from transactron.testing import TestCaseWithSimulator, TestbenchIO
 from transactron.testing.functions import data_const_to_dict
-from transactron.testing.sugar import MethodMock, async_def_method_mock
+from transactron.testing.method_mock import MethodMock, async_def_method_mock
 
 _rs1_optypes = {OpType.ARITHMETIC, OpType.COMPARE}
 _rs2_optypes = {OpType.LOGIC, OpType.COMPARE}

diff --git a/test/scheduler/test_scheduler.py b/test/scheduler/test_scheduler.py
@@ -12,7 +12,7 @@
 from transactron.core import Method
 from transactron.lib import FIFO, AdapterTrans, Adapter
 from transactron.testing.functions import MethodData, data_const_to_dict
-from transactron.testing.sugar import MethodMock
+from transactron.testing.method_mock import MethodMock
 from transactron.utils.dependencies import DependencyContext
 from coreblocks.scheduler.scheduler import Scheduler
 from coreblocks.core_structs.rf import RegisterFile

diff --git a/test/transactron/lib/test_transaction_lib.py b/test/transactron/lib/test_transaction_lib.py
@@ -11,7 +11,7 @@
 from amaranth import *
 from transactron import *
 from transactron.lib import *
-from transactron.testing.sugar import MethodMock
+from transactron.testing.method_mock import MethodMock
 from transactron.testing.testbenchio import CallTrigger
 from transactron.utils._typing import ModuleLike, MethodStruct, RecordDict
 from transactron.utils import ModuleConnector

diff --git a/test/transactron/test_simultaneous.py b/test/transactron/test_simultaneous.py
@@ -4,7 +4,7 @@
 from typing import Optional
 from amaranth import *
 from amaranth.sim import *
-from transactron.testing.sugar import MethodMock, async_def_method_mock
+from transactron.testing.method_mock import MethodMock, async_def_method_mock
 from transactron.testing.testbenchio import TestbenchIO
 
 from transactron.utils import ModuleConnector

diff --git a/test/transactron/testing/test_validate_arguments.py b/test/transactron/testing/test_validate_arguments.py
@@ -6,7 +6,7 @@
 from transactron.testing import TestCaseWithSimulator, TestbenchIO, data_layout
 
 from transactron import *
-from transactron.testing.sugar import async_def_method_mock
+from transactron.testing.method_mock import async_def_method_mock
 from transactron.lib import *
 from transactron.testing.testbenchio import CallTrigger
 

diff --git a/transactron/testing/__init__.py b/transactron/testing/__init__.py
@@ -3,7 +3,7 @@
 from .input_generation import *  # noqa: F401
 from .functions import *  # noqa: F401
 from .infrastructure import *  # noqa: F401
-from .sugar import *  # noqa: F401
+from .method_mock import *  # noqa: F401
 from .testbenchio import *  # noqa: F401
 from .profiler import *  # noqa: F401
 from .logging import *  # noqa: F401

diff --git a/transactron/testing/infrastructure.py b/transactron/testing/infrastructure.py
@@ -17,12 +17,12 @@
 from .logging import make_logging_process, parse_logging_level, _LogFormatter
 from .tick_count import make_tick_count_process
 from .gtkw_extension import write_vcd_ext
+from .method_mock import MethodMock
 from transactron import Method
 from transactron.lib import AdapterTrans
 from transactron.core.keys import TransactionManagerKey
 from transactron.core import TransactionModule
 from transactron.utils import ModuleConnector, HasElaborate, auto_debug_signals, HasDebugSignals
-from transactron.testing.sugar import MethodMock
 
 
 __all__ = ["SimpleTestCircuit", "PysimSimulator", "TestCaseWithSimulator"]

diff --git a/transactron/testing/sugar.py → transactron/testing/method_mock.py b/transactron/testing/sugar.py → transactron/testing/method_mock.py