@@ -40,7 +40,6 @@ use crate::system::{
40
40
memory:: {
41
41
merkle:: { DirectCompressionBus , MemoryMerkleBus } ,
42
42
offline_checker:: { MemoryBridge , MemoryBus } ,
43
- online:: MemoryLogEntry ,
44
43
MemoryController , MemoryImage , OfflineMemory , BOUNDARY_AIR_OFFSET , MERKLE_AIR_OFFSET ,
45
44
} ,
46
45
native_adapter:: NativeAdapterChip ,
@@ -213,14 +212,6 @@ pub struct VmInventory<E, P> {
213
212
insertion_order : Vec < ChipId > ,
214
213
}
215
214
216
- #[ derive( Clone , Serialize , Deserialize ) ]
217
- pub struct VmInventoryState {
218
- /// Executor states in order
219
- pub executors : Vec < Vec < u8 > > ,
220
- /// Periphery states in order
221
- pub periphery : Vec < Vec < u8 > > ,
222
- }
223
-
224
215
#[ derive( Debug , Clone , Serialize , Deserialize , PartialEq , Eq ) ]
225
216
pub struct VmInventoryTraceHeights {
226
217
pub chips : FxHashMap < ChipId , usize > ,
@@ -455,12 +446,6 @@ pub struct VmChipComplex<F: PrimeField32, E, P> {
455
446
bus_idx_max : usize ,
456
447
}
457
448
458
- #[ derive( Clone , Serialize , Deserialize ) ]
459
- pub struct VmChipComplexState < F > {
460
- pub base : SystemBaseState < F > ,
461
- pub inventory : VmInventoryState ,
462
- }
463
-
464
449
/// The base [VmChipComplex] with only system chips.
465
450
pub type SystemComplex < F > = VmChipComplex < F , SystemExecutor < F > , SystemPeriphery < F > > ;
466
451
@@ -475,15 +460,6 @@ pub struct SystemBase<F> {
475
460
pub program_chip : ProgramChip < F > ,
476
461
}
477
462
478
- #[ derive( Clone , Serialize , Deserialize ) ]
479
- pub struct SystemBaseState < F > {
480
- pub range_checker_chip : Vec < u8 > ,
481
- pub initial_memory : Option < MemoryImage < F > > ,
482
- pub memory_logs : Vec < MemoryLogEntry < F > > ,
483
- pub connector_chip : Vec < u8 > ,
484
- pub program_chip : Vec < u8 > ,
485
- }
486
-
487
463
impl < F : PrimeField32 > SystemBase < F > {
488
464
pub fn range_checker_bus ( & self ) -> VariableRangeCheckerBus {
489
465
self . range_checker_chip . bus ( )
0 commit comments