Type fixes.

test/transactions/test_transactron_lib_storage.py

@@ -1,4 +1,4 @@
-from test.common import *
+from transactron.testing import *
 import random
 from transactron.lib.storage import ContentAddressableMemory
 

test/utils/test_amaranth_ext.py

@@ -1,4 +1,4 @@
-from test.common import *
+from transactron.testing import *
 import random
 from transactron.utils.amaranth_ext import MultiPriorityEncoder
 

transactron/lib/storage.py

@@ -163,7 +163,7 @@ class ContentAddressableMemory(Elaboratable):
         Inserts new data.
     """
 
-    def __init__(self, address_layout: MethodLayout, data_layout: LayoutList, entries_number: int):
+    def __init__(self, address_layout: MethodLayout, data_layout: MethodLayout, entries_number: int):
         """
         Parameters
         ----------

transactron/testing/input_generation.py

@@ -1,11 +1,14 @@
 from amaranth import *
+from amaranth.lib.data import StructLayout
 import random
 from typing import Optional
 from hypothesis.strategies import composite, DrawFn, integers
-from transactron.utils import LayoutList
+from transactron.utils import MethodLayout
 
 @composite
-def generate_based_on_layout(draw : DrawFn, layout: LayoutList):
+def generate_based_on_layout(draw : DrawFn, layout: MethodLayout):
+    if isinstance(layout, StructLayout):
+        raise NotImplementedError("StructLayout is not supported in automatic value generation.")
     d = {}
     for name, sublayout in layout:
         if isinstance(sublayout, list):

transactron/utils/data_repr.py

@@ -1,5 +1,5 @@
 from collections.abc import Iterable, Mapping
-from ._typing import LayoutList, ShapeLike
+from ._typing import ShapeLike, MethodLayout
 from typing import Any, Sized
 from statistics import fmean
 from amaranth.lib.data import StructLayout
@@ -78,7 +78,7 @@ def bits_from_int(num: int, lower: int, length: int):
     return (num >> lower) & ((1 << (length)) - 1)
 
 
-def data_layout(val: ShapeLike) -> SimpleLayout:
+def data_layout(val: ShapeLike) -> MethodLayout:
     return [("data", val)]
 
 

transactron/utils/transactron_helpers.py

@@ -133,7 +133,7 @@ def from_layout_field(shape: ShapeLike | LayoutList) -> ShapeLike:
         return shape
 
 
-def make_layout(*fields: LayoutListField):
+def make_layout(*fields: LayoutListField) -> StructLayout:
     return from_method_layout(fields)