refactor!: rename master_aux_table to master_table

This category of snippets deals with both main and auxiliary tables, not
just with auxiliary tables as the name would indicate.

Author: Sword-Smith

tasm-lib/src/exported_snippets.rs

@@ -90,10 +90,10 @@ use crate::verifier::challenges::new_empty_input_and_output::NewEmptyInputAndOut
 use crate::verifier::challenges::new_generic_dyn_claim::NewGenericDynClaim;
 use crate::verifier::claim::instantiate_fiat_shamir_with_claim::InstantiateFiatShamirWithClaim;
 use crate::verifier::fri;
-use crate::verifier::master_aux_table::air_constraint_evaluation::AirConstraintEvaluation;
-use crate::verifier::master_aux_table::divide_out_zerofiers::DivideOutZerofiers;
-use crate::verifier::master_aux_table::verify_table_rows::ColumnType;
-use crate::verifier::master_aux_table::verify_table_rows::VerifyTableRows;
+use crate::verifier::master_table::air_constraint_evaluation::AirConstraintEvaluation;
+use crate::verifier::master_table::divide_out_zerofiers::DivideOutZerofiers;
+use crate::verifier::master_table::verify_table_rows::ColumnType;
+use crate::verifier::master_table::verify_table_rows::VerifyTableRows;
 use crate::verifier::own_program_digest::OwnProgramDigest;
 use crate::verifier::read_and_verify_own_program_digest_from_std_in::ReadAndVerifyOwnProgramDigestFromStdIn;
 use crate::verifier::vm_proof_iter::dequeue_next_as::DequeueNextAs;
@@ -436,19 +436,19 @@ pub fn name_to_snippet(fn_name: &str) -> Box<dyn BasicSnippet> {
                 = NewEmptyInputAndOutput::new(num_challenges_to_sample, num_challenges_to_compute, challenges::shared::conventional_challenges_pointer());
             Box::new(challenge_snippet)
         }
-        "tasmlib_verifier_master_aux_table_air_constraint_evaluation" => {
+        "tasmlib_verifier_master_table_air_constraint_evaluation" => {
             Box::new(AirConstraintEvaluation::with_conventional_dynamic_memory_layout())
         }
-        "tasmlib_verifier_master_aux_table_divide_out_zerofiers" => {
+        "tasmlib_verifier_master_table_divide_out_zerofiers" => {
             Box::new(DivideOutZerofiers)
         }
-        "tasmlib_verifier_master_aux_table_verify_Main_table_rows"=> {
+        "tasmlib_verifier_master_table_verify_Main_table_rows"=> {
             Box::new(VerifyTableRows::new(ColumnType::Main))
         }
-        "tasmlib_verifier_master_aux_table_verify_Aux_table_rows"=> {
+        "tasmlib_verifier_master_table_verify_Aux_table_rows"=> {
             Box::new(VerifyTableRows::new(ColumnType::Aux))
         }
-        "tasmlib_verifier_master_aux_table_verify_Quotient_table_rows"=> {
+        "tasmlib_verifier_master_table_verify_Quotient_table_rows"=> {
             Box::new(VerifyTableRows::new(ColumnType::Quotient))
         }
 

tasm-lib/src/verifier.rs

@@ -2,7 +2,7 @@ pub mod challenges;
 pub mod claim;
 pub mod eval_arg;
 pub mod fri;
-pub mod master_aux_table;
+pub mod master_table;
 pub mod out_of_domain_points;
 pub mod own_program_digest;
 pub mod read_and_verify_own_program_digest_from_std_in;

tasm-lib/src/verifier/master_aux_table.rs renamed to tasm-lib/src/verifier/master_table.rs

@@ -224,7 +224,7 @@ impl BasicSnippet for AirConstraintEvaluation {
         );
 
         // Consider parameterizing this entrypoint name if you need more than one instance.
-        "tasmlib_verifier_master_aux_table_air_constraint_evaluation".to_owned()
+        "tasmlib_verifier_master_table_air_constraint_evaluation".to_owned()
     }
 
     fn code(&self, _library: &mut Library) -> Vec<LabelledInstruction> {

tasm-lib/src/verifier/master_aux_table/air_constraint_evaluation.rs renamed to tasm-lib/src/verifier/master_table/air_constraint_evaluation.rs

@@ -6,9 +6,9 @@ use triton_vm::twenty_first::math::x_field_element::EXTENSION_DEGREE;
 use crate::data_type::DataType;
 use crate::library::Library;
 use crate::traits::basic_snippet::BasicSnippet;
-use crate::verifier::master_aux_table::air_constraint_evaluation::AirConstraintEvaluation;
-use crate::verifier::master_aux_table::zerofiers_inverse::ConstraintType;
-use crate::verifier::master_aux_table::zerofiers_inverse::ZerofiersInverse;
+use crate::verifier::master_table::air_constraint_evaluation::AirConstraintEvaluation;
+use crate::verifier::master_table::zerofiers_inverse::ConstraintType;
+use crate::verifier::master_table::zerofiers_inverse::ZerofiersInverse;
 
 /// Evaluates the AIR and divides out the zerofiers in-place, meaning that the
 /// results from the AIR-evaluation are overwritten.
@@ -33,7 +33,7 @@ impl BasicSnippet for DivideOutZerofiers {
     }
 
     fn entrypoint(&self) -> String {
-        "tasmlib_verifier_master_aux_table_divide_out_zerofiers".to_owned()
+        "tasmlib_verifier_master_table_divide_out_zerofiers".to_owned()
     }
 
     fn code(&self, library: &mut Library) -> Vec<LabelledInstruction> {

tasm-lib/src/verifier/master_aux_table/divide_out_zerofiers.rs renamed to tasm-lib/src/verifier/master_table/divide_out_zerofiers.rs

@@ -64,7 +64,7 @@ impl BasicSnippet for VerifyTableRows {
 
     fn entrypoint(&self) -> String {
         format!(
-            "tasmlib_verifier_master_aux_table_verify_{}_table_rows",
+            "tasmlib_verifier_master_table_verify_{}_table_rows",
             self.column_type
         )
     }

tasm-lib/src/verifier/master_aux_table/verify_table_rows.rs renamed to tasm-lib/src/verifier/master_table/verify_table_rows.rs

@@ -67,7 +67,7 @@ impl BasicSnippet for ZerofiersInverse {
     }
 
     fn entrypoint(&self) -> String {
-        "tasmlib_verifier_master_aux_table_zerofiers_inverse".to_owned()
+        "tasmlib_verifier_master_table_zerofiers_inverse".to_owned()
     }
 
     fn code(&self, library: &mut Library) -> Vec<LabelledInstruction> {

tasm-lib/src/verifier/master_aux_table/zerofiers_inverse.rs renamed to tasm-lib/src/verifier/master_table/zerofiers_inverse.rs

@@ -27,17 +27,17 @@ use crate::verifier::claim::shared::claim_type;
 use crate::verifier::fri;
 use crate::verifier::fri::verify::FriSnippet;
 use crate::verifier::fri::verify::FriVerify;
-use crate::verifier::master_aux_table::divide_out_zerofiers::DivideOutZerofiers;
-use crate::verifier::master_aux_table::verify_table_rows::ColumnType;
-use crate::verifier::master_aux_table::verify_table_rows::VerifyTableRows;
+use crate::verifier::master_table::divide_out_zerofiers::DivideOutZerofiers;
+use crate::verifier::master_table::verify_table_rows::ColumnType;
+use crate::verifier::master_table::verify_table_rows::VerifyTableRows;
 use crate::verifier::out_of_domain_points::OodPoint;
 use crate::verifier::out_of_domain_points::OutOfDomainPoints;
 use crate::verifier::vm_proof_iter::dequeue_next_as::DequeueNextAs;
 use crate::verifier::vm_proof_iter::new::New;
 use triton_vm::proof_stream::ProofStream;
 
-use super::master_aux_table::air_constraint_evaluation::AirConstraintEvaluation;
-use super::master_aux_table::air_constraint_evaluation::MemoryLayout;
+use super::master_table::air_constraint_evaluation::AirConstraintEvaluation;
+use super::master_table::air_constraint_evaluation::MemoryLayout;
 
 /// Verify a STARK proof.
 ///
@@ -1238,7 +1238,7 @@ pub mod tests {
     use crate::memory::FIRST_NON_DETERMINISTICALLY_INITIALIZED_MEMORY_ADDRESS;
     use crate::test_helpers::maybe_write_tvm_output_to_disk;
     use crate::verifier::claim::shared::insert_claim_into_static_memory;
-    use crate::verifier::master_aux_table::air_constraint_evaluation::an_integral_but_profane_dynamic_memory_layout;
+    use crate::verifier::master_table::air_constraint_evaluation::an_integral_but_profane_dynamic_memory_layout;
     use num_traits::ConstZero;
 
     use super::*;