Skip to content

Commit 20a720d

Browse files
committed
refactor
1 parent da9c2d3 commit 20a720d

8 files changed

+19
-33
lines changed

Diff for: src/fri/fri_config.cairo

+2-8
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use core::array::ArrayTrait;
22
use core::option::OptionTrait;
33
use core::array::SpanTrait;
44
use core::traits::Into;
5-
use cairo_verifier::structs::table_commitment_config::TableCommitmentConfig;
6-
use cairo_verifier::structs::vector_commitment_config::VectorCommitmentConfig;
5+
use cairo_verifier::table_commitment::TableCommitmentConfig;
6+
use cairo_verifier::vector_commitment::{validate_vector_commitment, VectorCommitmentConfig};
77

88
const MAX_LAST_LAYER_LOG_DEGREE_BOUND: u32 = 15;
99
const MAX_FRI_LAYERS: u32 = 15;
@@ -69,9 +69,3 @@ fn fri_config_validate(
6969
log_expected_input_degree
7070
}
7171

72-
// ghost functions
73-
fn validate_vector_commitment(
74-
config: VectorCommitmentConfig,
75-
expected_height: felt252,
76-
n_verifier_friendly_commitment_layers: felt252,
77-
) {}

Diff for: src/structs.cairo

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
mod proof_of_work_config;
22
mod stark_config;
33
mod stark_proof;
4-
mod table_commitment_config;
54
mod traces_config;
65
mod unsent_commitment;
7-
mod vector_commitment_config;
86
mod witness;

Diff for: src/structs/stark_config.cairo

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use cairo_verifier::structs::traces_config::TracesConfig;
2-
use cairo_verifier::structs::table_commitment_config::TableCommitmentConfig;
2+
use cairo_verifier::table_commitment::TableCommitmentConfig;
33
use cairo_verifier::fri::fri_config::FriConfig;
44
use cairo_verifier::structs::proof_of_work_config::ProofOfWorkConfig;
55

Diff for: src/structs/table_commitment_config.cairo

-7
This file was deleted.

Diff for: src/structs/traces_config.cairo

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use cairo_verifier::structs::table_commitment_config::TableCommitmentConfig;
1+
use cairo_verifier::table_commitment::TableCommitmentConfig;
22

33
struct TracesConfig {
44
original: TableCommitmentConfig,

Diff for: src/structs/vector_commitment_config.cairo

-5
This file was deleted.

Diff for: src/table_commitment.cairo

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
use cairo_verifier::vector_commitment::VectorCommitmentConfig;
2+
13
// Commitment values for a table commitment protocol. Used to generate a commitment by "reading"
24
// these values from the channel.
35
#[derive(Drop, Copy)]
@@ -16,9 +18,8 @@ struct TableCommitment {
1618

1719
#[derive(Drop, Copy)]
1820
struct TableCommitmentConfig {
19-
a: felt252, // dummy
20-
// n_columns: felt,
21-
// vector: VectorCommitmentConfig*,
21+
columns: felt252,
22+
vector: VectorCommitmentConfig
2223
}
2324

2425
fn table_commit(

Diff for: src/vector_commitment.cairo

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
11
// Commitment values for a vector commitment. Used to generate a commitment by "reading" these
22
// values from the channel.
3-
#[derive(Drop)]
3+
#[derive(Drop, Copy)]
44
struct VectorUnsentCommitment {
55
a: felt252, // dummy
66
// commitment_hash: ChannelUnsentFelt,
77
}
88

99
// Commitment for a vector of field elements.
10-
#[derive(Drop)]
10+
#[derive(Drop, Copy)]
1111
struct VectorCommitment {
1212
a: felt252, // dummy
1313
// config: VectorCommitmentConfig*,
1414
// commitment_hash: ChannelSentFelt,
1515
}
1616

17-
#[derive(Drop)]
17+
#[derive(Drop, Copy)]
1818
struct VectorCommitmentConfig {
19-
a: felt252, // dummy
20-
// height: felt,
21-
// n_verifier_friendly_commitment_layers: felt,
19+
height: felt252,
20+
verifier_friendly_commitment_layers: felt252,
2221
}
22+
23+
fn validate_vector_commitment(
24+
config: VectorCommitmentConfig,
25+
expected_height: felt252,
26+
n_verifier_friendly_commitment_layers: felt252,
27+
) {}

0 commit comments

Comments
 (0)