refactor

src/fri/fri_config.cairo

@@ -2,8 +2,8 @@ use core::array::ArrayTrait;
 use core::option::OptionTrait;
 use core::array::SpanTrait;
 use core::traits::Into;
-use cairo_verifier::structs::table_commitment_config::TableCommitmentConfig;
-use cairo_verifier::structs::vector_commitment_config::VectorCommitmentConfig;
+use cairo_verifier::table_commitment::TableCommitmentConfig;
+use cairo_verifier::vector_commitment::{validate_vector_commitment, VectorCommitmentConfig};
 
 const MAX_LAST_LAYER_LOG_DEGREE_BOUND: u32 = 15;
 const MAX_FRI_LAYERS: u32 = 15;
@@ -69,9 +69,3 @@ fn fri_config_validate(
     log_expected_input_degree
 }
 
-// ghost functions
-fn validate_vector_commitment(
-    config: VectorCommitmentConfig,
-    expected_height: felt252,
-    n_verifier_friendly_commitment_layers: felt252,
-) {}

src/structs.cairo

@@ -1,8 +1,6 @@
 mod proof_of_work_config;
 mod stark_config;
 mod stark_proof;
-mod table_commitment_config;
 mod traces_config;
 mod unsent_commitment;
-mod vector_commitment_config;
 mod witness;

src/structs/stark_config.cairo

@@ -1,5 +1,5 @@
 use cairo_verifier::structs::traces_config::TracesConfig;
-use cairo_verifier::structs::table_commitment_config::TableCommitmentConfig;
+use cairo_verifier::table_commitment::TableCommitmentConfig;
 use cairo_verifier::fri::fri_config::FriConfig;
 use cairo_verifier::structs::proof_of_work_config::ProofOfWorkConfig;
 

src/structs/traces_config.cairo

@@ -1,4 +1,4 @@
-use cairo_verifier::structs::table_commitment_config::TableCommitmentConfig;
+use cairo_verifier::table_commitment::TableCommitmentConfig;
 
 struct TracesConfig {
     original: TableCommitmentConfig,

src/table_commitment.cairo

@@ -1,3 +1,5 @@
+use cairo_verifier::vector_commitment::VectorCommitmentConfig;
+
 // Commitment values for a table commitment protocol. Used to generate a commitment by "reading"
 // these values from the channel.
 #[derive(Drop, Copy)]
@@ -16,9 +18,8 @@ struct TableCommitment {
 
 #[derive(Drop, Copy)]
 struct TableCommitmentConfig {
-    a: felt252, // dummy
-// n_columns: felt,
-// vector: VectorCommitmentConfig*,
+    columns: felt252,
+    vector: VectorCommitmentConfig
 }
 
 fn table_commit(

src/vector_commitment.cairo

@@ -1,22 +1,27 @@
 // Commitment values for a vector commitment. Used to generate a commitment by "reading" these
 // values from the channel.
-#[derive(Drop)]
+#[derive(Drop, Copy)]
 struct VectorUnsentCommitment {
     a: felt252, // dummy
 // commitment_hash: ChannelUnsentFelt,
 }
 
 // Commitment for a vector of field elements.
-#[derive(Drop)]
+#[derive(Drop, Copy)]
 struct VectorCommitment {
     a: felt252, // dummy
 // config: VectorCommitmentConfig*,
 // commitment_hash: ChannelSentFelt,
 }
 
-#[derive(Drop)]
+#[derive(Drop, Copy)]
 struct VectorCommitmentConfig {
-    a: felt252, // dummy
-// height: felt,
-// n_verifier_friendly_commitment_layers: felt,
+    height: felt252,
+    verifier_friendly_commitment_layers: felt252,
 }
+
+fn validate_vector_commitment(
+    config: VectorCommitmentConfig,
+    expected_height: felt252,
+    n_verifier_friendly_commitment_layers: felt252,
+) {}