change InstanceObserver name to InputsCollector

0xPolygonHermez · Dec 12, 2024 · fc74053 · fc74053
1 parent c985df4
commit fc74053
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/state-machines/arith/src/arith_full_instance.rs b/state-machines/arith/src/arith_full_instance.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use p3_field::PrimeField;
 
 use proofman_common::{AirInstance, FromTrace};
-use sm_common::{Instance, InstanceExpanderCtx, InstanceType, RegularInstance};
+use sm_common::{InputsCollector, Instance, InstanceExpanderCtx, InstanceType};
 use zisk_core::{ZiskRequiredOperation, ZiskRom};
 use zisk_pil::ArithTrace;
 use ziskemu::EmuTrace;
@@ -29,7 +29,7 @@ impl<F: PrimeField> Instance<F> for ArithFullInstance<F> {
         zisk_rom: &ZiskRom,
         min_traces: Arc<Vec<EmuTrace>>,
     ) -> Result<(), Box<dyn std::error::Error + Send>> {
-        self.inputs = RegularInstance::collect(
+        self.inputs = InputsCollector::collect(
             self.iectx.plan.check_point.unwrap(),
             ArithTrace::<F>::NUM_ROWS,
             zisk_rom,

diff --git a/state-machines/binary/src/binary_basic_instance.rs b/state-machines/binary/src/binary_basic_instance.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use p3_field::PrimeField;
 
 use proofman_common::{AirInstance, FromTrace};
-use sm_common::{Instance, InstanceExpanderCtx, InstanceType, RegularInstance};
+use sm_common::{InputsCollector, Instance, InstanceExpanderCtx, InstanceType};
 use zisk_core::{ZiskRequiredOperation, ZiskRom};
 use zisk_pil::BinaryTrace;
 use ziskemu::EmuTrace;
@@ -30,7 +30,7 @@ impl<F: PrimeField> Instance<F> for BinaryBasicInstance<F> {
         zisk_rom: &ZiskRom,
         min_traces: Arc<Vec<EmuTrace>>,
     ) -> Result<(), Box<dyn std::error::Error + Send>> {
-        self.inputs = RegularInstance::collect(
+        self.inputs = InputsCollector::collect(
             self.iectx.plan.check_point.unwrap(),
             BinaryTrace::<F>::NUM_ROWS,
             zisk_rom,

diff --git a/state-machines/binary/src/binary_extension_instance.rs b/state-machines/binary/src/binary_extension_instance.rs
@@ -4,7 +4,7 @@ use p3_field::PrimeField;
 
 use proofman_common::{AirInstance, FromTrace};
 use proofman_util::{timer_start_debug, timer_stop_and_log_debug};
-use sm_common::{Instance, InstanceExpanderCtx, InstanceType, RegularInstance};
+use sm_common::{InputsCollector, Instance, InstanceExpanderCtx, InstanceType};
 use zisk_core::{ZiskRequiredOperation, ZiskRom};
 use zisk_pil::BinaryExtensionTrace;
 use ziskemu::EmuTrace;
@@ -36,7 +36,7 @@ impl<F: PrimeField> Instance<F> for BinaryExtensionInstance<F> {
         zisk_rom: &ZiskRom,
         min_traces: Arc<Vec<EmuTrace>>,
     ) -> Result<(), Box<dyn std::error::Error + Send>> {
-        self.inputs = RegularInstance::collect(
+        self.inputs = InputsCollector::collect(
             self.iectx.plan.check_point.unwrap(),
             BinaryExtensionTrace::<F>::NUM_ROWS,
             zisk_rom,

diff --git a/...nce_observer/regular_instance_observer.rs → ...src/instance_observer/inputs_collector.rs b/...nce_observer/regular_instance_observer.rs → ...src/instance_observer/inputs_collector.rs
@@ -7,7 +7,7 @@ use zisk_core::{InstContext, ZiskInst, ZiskOperationType, ZiskRequiredOperation}
 use zisk_core::ZiskRom;
 use ziskemu::{EmuTrace, ZiskEmulator};
 
-pub struct RegularInstance {
+pub struct InputsCollector {
     check_point: CheckPoint,
     num_rows: usize,
     op_type: ZiskOperationType,
@@ -17,7 +17,7 @@ pub struct RegularInstance {
     inputs: Vec<ZiskRequiredOperation>,
 }
 
-impl RegularInstance {
+impl InputsCollector {
     pub fn collect(
         check_point: CheckPoint,
         num_rows: usize,
@@ -38,7 +38,7 @@ impl RegularInstance {
     }
 }
 
-impl InstObserver for RegularInstance {
+impl InstObserver for InputsCollector {
     #[inline(always)]
     fn on_instruction(&mut self, zisk_inst: &ZiskInst, inst_ctx: &InstContext) -> bool {
         if zisk_inst.op_type != self.op_type {

diff --git a/state-machines/common/src/instance_observer/mod.rs b/state-machines/common/src/instance_observer/mod.rs
@@ -1,3 +1,3 @@
-mod regular_instance_observer;
+mod inputs_collector;
 
-pub use regular_instance_observer::*;
+pub use inputs_collector::*;