Skip to content

Commit 6e017bb

Browse files
alon-falon-f
authored
rename draw_felt_s to draw_secure_felt_s (#1147)
1 parent b5e8e1a commit 6e017bb

File tree

16 files changed

+70
-66
lines changed

16 files changed

+70
-66
lines changed

‎crates/constraint_framework/src/logup.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ pub struct LookupElements<const N: usize> {
8080
}
8181
impl<const N: usize> LookupElements<N> {
8282
pub fn draw(channel: &mut impl Channel) -> Self {
83-
let [z, alpha] = channel.draw_felts(2).try_into().unwrap();
83+
let [z, alpha] = channel.draw_secure_felts(2).try_into().unwrap();
8484
let mut cur = SecureField::one();
8585
let alpha_powers = std::array::from_fn(|_| {
8686
let res = cur;

‎crates/prover/src/core/backend/cpu/lookups/gkr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ mod tests {
317317
#[test]
318318
fn grand_product_works() -> Result<(), GkrError> {
319319
const N: usize = 1 << 5;
320-
let values = test_channel().draw_felts(N);
320+
let values = test_channel().draw_secure_felts(N);
321321
let product = values.iter().product::<SecureField>();
322322
let col = Mle::<CpuBackend, SecureField>::new(values);
323323
let input_layer = Layer::GrandProduct(col.clone());

‎crates/prover/src/core/backend/simd/lookups/gkr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ mod tests {
550550
#[test]
551551
fn grand_product_works() -> Result<(), GkrError> {
552552
const N: usize = 1 << 8;
553-
let values = test_channel().draw_felts(N);
553+
let values = test_channel().draw_secure_felts(N);
554554
let product = values.iter().product();
555555
let col = Mle::<SimdBackend, SecureField>::new(values.into_iter().collect());
556556
let input_layer = Layer::GrandProduct(col.clone());

‎crates/prover/src/core/backend/simd/lookups/mle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ mod tests {
104104
#[test]
105105
fn fix_first_variable_with_secure_field_mle_matches_cpu() {
106106
const N_VARIABLES: u32 = 8;
107-
let values = test_channel().draw_felts(1 << N_VARIABLES);
107+
let values = test_channel().draw_secure_felts(1 << N_VARIABLES);
108108
let mle_simd = Mle::<SimdBackend, SecureField>::new(values.iter().copied().collect());
109109
let mle_cpu = Mle::<CpuBackend, SecureField>::new(values);
110110
let random_assignment = SecureField::from_u32_unchecked(7, 12, 3, 2);

‎crates/prover/src/core/channel/blake2s.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ impl Channel for Blake2sChannel {
8585
self.mix_u32s(&[value as u32, (value >> 32) as u32])
8686
}
8787

88-
fn draw_felt(&mut self) -> SecureField {
88+
fn draw_secure_felt(&mut self) -> SecureField {
8989
let felts: [BaseField; FELTS_PER_HASH] = self.draw_base_felts();
9090
SecureField::from_m31_array(felts[..SECURE_EXTENSION_DEGREE].try_into().unwrap())
9191
}
9292

93-
fn draw_felts(&mut self, n_felts: usize) -> Vec<SecureField> {
93+
fn draw_secure_felts(&mut self, n_felts: usize) -> Vec<SecureField> {
9494
let mut felts = iter::from_fn(|| Some(self.draw_base_felts())).flatten();
9595
let secure_felts = iter::from_fn(|| {
9696
Some(SecureField::from_m31_array([
@@ -138,7 +138,7 @@ mod tests {
138138
assert_eq!(channel.channel_time.n_challenges, 0);
139139
assert_eq!(channel.channel_time.n_sent, 1);
140140

141-
channel.draw_felts(9);
141+
channel.draw_secure_felts(9);
142142
assert_eq!(channel.channel_time.n_challenges, 0);
143143
assert_eq!(channel.channel_time.n_sent, 6);
144144
}
@@ -154,21 +154,21 @@ mod tests {
154154
}
155155

156156
#[test]
157-
pub fn test_draw_felt() {
157+
pub fn test_draw_secure_felt() {
158158
let mut channel = Blake2sChannel::default();
159159

160-
let first_random_felt = channel.draw_felt();
160+
let first_random_felt = channel.draw_secure_felt();
161161

162162
// Assert that next random felt is different.
163-
assert_ne!(first_random_felt, channel.draw_felt());
163+
assert_ne!(first_random_felt, channel.draw_secure_felt());
164164
}
165165

166166
#[test]
167-
pub fn test_draw_felts() {
167+
pub fn test_draw_secure_felts() {
168168
let mut channel = Blake2sChannel::default();
169169

170-
let mut random_felts = channel.draw_felts(5);
171-
random_felts.extend(channel.draw_felts(4));
170+
let mut random_felts = channel.draw_secure_felts(5);
171+
random_felts.extend(channel.draw_secure_felts(4));
172172

173173
// Assert that all the random felts are unique.
174174
assert_eq!(

‎crates/prover/src/core/channel/logging_channel.rs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,18 @@ impl<C: Channel> Channel for LoggingChannel<C> {
3636
log_mix(C::mix_u64, &mut self.channel, value)
3737
}
3838

39-
fn draw_felt(&mut self) -> SecureField {
40-
let _ = debug_span!("Channel draw_felt");
41-
log_draw(|ch, _| C::draw_felt(ch), &mut self.channel, ())
39+
fn draw_secure_felt(&mut self) -> SecureField {
40+
let _ = debug_span!("Channel draw_secure_felt");
41+
log_draw(|ch, _| C::draw_secure_felt(ch), &mut self.channel, ())
4242
}
4343

44-
fn draw_felts(&mut self, n_felts: usize) -> Vec<SecureField> {
45-
let _ = debug_span!("Channel draw_felts");
46-
log_draw(|ch, n| C::draw_felts(ch, n), &mut self.channel, n_felts)
44+
fn draw_secure_felts(&mut self, n_felts: usize) -> Vec<SecureField> {
45+
let _ = debug_span!("Channel draw_secure_felts");
46+
log_draw(
47+
|ch, n| C::draw_secure_felts(ch, n),
48+
&mut self.channel,
49+
n_felts,
50+
)
4751
}
4852

4953
fn draw_random_bytes(&mut self) -> Vec<u8> {
@@ -137,13 +141,13 @@ mod tests {
137141
logging_channel.mix_u64(value);
138142
regular_channel.mix_u64(value);
139143

140-
let felt1 = logging_channel.draw_felt();
141-
let felt2 = regular_channel.draw_felt();
144+
let felt1 = logging_channel.draw_secure_felt();
145+
let felt2 = regular_channel.draw_secure_felt();
142146
assert_eq!(felt1, felt2);
143147

144148
let n_felts = rng.gen_range(1..10);
145-
let felts1 = logging_channel.draw_felts(n_felts);
146-
let felts2 = regular_channel.draw_felts(n_felts);
149+
let felts1 = logging_channel.draw_secure_felts(n_felts);
150+
let felts2 = regular_channel.draw_secure_felts(n_felts);
147151
assert_eq!(felts1, felts2);
148152

149153
let bytes1 = logging_channel.draw_random_bytes();

‎crates/prover/src/core/channel/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ pub trait Channel: Default + Clone + Debug {
4343
fn mix_u64(&mut self, value: u64);
4444

4545
// Draw functions.
46-
fn draw_felt(&mut self) -> SecureField;
46+
fn draw_secure_felt(&mut self) -> SecureField;
4747
/// Generates a uniform random vector of SecureField elements.
48-
fn draw_felts(&mut self, n_felts: usize) -> Vec<SecureField>;
48+
fn draw_secure_felts(&mut self, n_felts: usize) -> Vec<SecureField>;
4949
/// Returns a vector of random bytes of length `BYTES_PER_HASH`.
5050
fn draw_random_bytes(&mut self) -> Vec<u8>;
5151
}

‎crates/prover/src/core/channel/poseidon252.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ impl Poseidon252Channel {
2727
self.digest = new_digest;
2828
self.channel_time.inc_challenges();
2929
}
30-
fn draw_felt252(&mut self) -> FieldElement252 {
30+
fn draw_secure_felt252(&mut self) -> FieldElement252 {
3131
let res = poseidon_hash(self.digest, self.channel_time.n_sent.into());
3232
self.channel_time.inc_sent();
3333
res
@@ -38,7 +38,7 @@ impl Poseidon252Channel {
3838
fn draw_base_felts(&mut self) -> [BaseField; 8] {
3939
let shift = (1u64 << 31).into();
4040

41-
let mut cur = self.draw_felt252();
41+
let mut cur = self.draw_secure_felt252();
4242
let u32s: [u32; 8] = std::array::from_fn(|_| {
4343
let next = cur.floor_div(shift);
4444
let res = cur - next * shift;
@@ -104,12 +104,12 @@ impl Channel for Poseidon252Channel {
104104
self.update_digest(poseidon_hash(self.digest, value.into()));
105105
}
106106

107-
fn draw_felt(&mut self) -> SecureField {
107+
fn draw_secure_felt(&mut self) -> SecureField {
108108
let felts: [BaseField; FELTS_PER_HASH] = self.draw_base_felts();
109109
SecureField::from_m31_array(felts[..SECURE_EXTENSION_DEGREE].try_into().unwrap())
110110
}
111111

112-
fn draw_felts(&mut self, n_felts: usize) -> Vec<SecureField> {
112+
fn draw_secure_felts(&mut self, n_felts: usize) -> Vec<SecureField> {
113113
let mut felts = iter::from_fn(|| Some(self.draw_base_felts())).flatten();
114114
let secure_felts = iter::from_fn(|| {
115115
Some(SecureField::from_m31_array([
@@ -124,7 +124,7 @@ impl Channel for Poseidon252Channel {
124124

125125
fn draw_random_bytes(&mut self) -> Vec<u8> {
126126
let shift = (1u64 << 8).into();
127-
let mut cur = self.draw_felt252();
127+
let mut cur = self.draw_secure_felt252();
128128
let bytes: [u8; 31] = std::array::from_fn(|_| {
129129
let next = cur.floor_div(shift);
130130
let res = cur - next * shift;
@@ -157,7 +157,7 @@ mod tests {
157157
assert_eq!(channel.channel_time.n_challenges, 0);
158158
assert_eq!(channel.channel_time.n_sent, 1);
159159

160-
channel.draw_felts(9);
160+
channel.draw_secure_felts(9);
161161
assert_eq!(channel.channel_time.n_challenges, 0);
162162
assert_eq!(channel.channel_time.n_sent, 6);
163163
}
@@ -173,21 +173,21 @@ mod tests {
173173
}
174174

175175
#[test]
176-
pub fn test_draw_felt() {
176+
pub fn test_draw_secure_felt() {
177177
let mut channel = Poseidon252Channel::default();
178178

179-
let first_random_felt = channel.draw_felt();
179+
let first_random_felt = channel.draw_secure_felt();
180180

181181
// Assert that next random felt is different.
182-
assert_ne!(first_random_felt, channel.draw_felt());
182+
assert_ne!(first_random_felt, channel.draw_secure_felt());
183183
}
184184

185185
#[test]
186-
pub fn test_draw_felts() {
186+
pub fn test_draw_secure_felts() {
187187
let mut channel = Poseidon252Channel::default();
188188

189-
let mut random_felts = channel.draw_felts(5);
190-
random_felts.extend(channel.draw_felts(4));
189+
let mut random_felts = channel.draw_secure_felts(5);
190+
random_felts.extend(channel.draw_secure_felts(4));
191191

192192
// Assert that all the random felts are unique.
193193
assert_eq!(

‎crates/prover/src/core/circle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ impl CirclePoint<SecureField> {
167167
}
168168

169169
pub fn get_random_point<C: Channel>(channel: &mut C) -> Self {
170-
let t = channel.draw_felt();
170+
let t = channel.draw_secure_felt();
171171
let t_square = t.square();
172172

173173
let one_plus_tsquared_inv = t_square.add(SecureField::one()).inverse();

‎crates/prover/src/core/fri.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ impl<'a, B: FriOps + MerkleOps<MC::H>, MC: MerkleChannel> FriProver<'a, B, MC> {
230230
let mut layer_evaluation = LineEvaluation::new_zero(first_inner_layer_domain);
231231
let mut columns = columns.iter().peekable();
232232
let mut layers = Vec::new();
233-
let folding_alpha = channel.draw_felt();
233+
let folding_alpha = channel.draw_secure_felt();
234234

235235
// Folding the max size column.
236236
B::fold_circle_into_line(
@@ -243,7 +243,7 @@ impl<'a, B: FriOps + MerkleOps<MC::H>, MC: MerkleChannel> FriProver<'a, B, MC> {
243243
while layer_evaluation.len() > config.last_layer_domain_size() {
244244
let layer = FriInnerLayerProver::new(layer_evaluation);
245245
MC::mix_root(channel, layer.merkle_tree.root());
246-
let folding_alpha = channel.draw_felt();
246+
let folding_alpha = channel.draw_secure_felt();
247247
layer_evaluation = B::fold_line(&layer.evaluation, folding_alpha, twiddles);
248248

249249
// Check for circle polys in the first layer that should be combined in this layer.
@@ -390,7 +390,7 @@ impl<MC: MerkleChannel> FriVerifier<MC> {
390390
column_bounds,
391391
column_commitment_domains,
392392
proof: proof.first_layer,
393-
folding_alpha: channel.draw_felt(),
393+
folding_alpha: channel.draw_secure_felt(),
394394
};
395395

396396
let mut inner_layers = Vec::new();
@@ -405,7 +405,7 @@ impl<MC: MerkleChannel> FriVerifier<MC> {
405405
inner_layers.push(FriInnerLayerVerifier {
406406
degree_bound: layer_bound,
407407
domain: layer_domain,
408-
folding_alpha: channel.draw_felt(),
408+
folding_alpha: channel.draw_secure_felt(),
409409
layer_index,
410410
proof,
411411
});

‎crates/prover/src/core/lookups/gkr_prover.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,8 @@ pub fn prove_batch<B: GkrOps>(
441441
}
442442

443443
let eq_evals = EqEvals::generate(&ood_point);
444-
let sumcheck_alpha = channel.draw_felt();
445-
let instance_lambda = channel.draw_felt();
444+
let sumcheck_alpha = channel.draw_secure_felt();
445+
let instance_lambda = channel.draw_secure_felt();
446446

447447
let mut sumcheck_oracles = Vec::new();
448448
let mut sumcheck_claims = Vec::new();
@@ -474,7 +474,7 @@ pub fn prove_batch<B: GkrOps>(
474474
layer_masks_by_instance[instance].push(mask.clone());
475475
}
476476

477-
let challenge = channel.draw_felt();
477+
let challenge = channel.draw_secure_felt();
478478
ood_point = sumcheck_ood_point;
479479
ood_point.push(challenge);
480480

‎crates/prover/src/core/lookups/gkr_verifier.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ pub fn partially_verify_batch(
6363
channel.mix_felts(claims_to_verify);
6464
}
6565

66-
let sumcheck_alpha = channel.draw_felt();
67-
let instance_lambda = channel.draw_felt();
66+
let sumcheck_alpha = channel.draw_secure_felt();
67+
let instance_lambda = channel.draw_secure_felt();
6868

6969
let mut sumcheck_claims = Vec::new();
7070
let mut sumcheck_instances = Vec::new();
@@ -124,7 +124,7 @@ pub fn partially_verify_batch(
124124
}
125125

126126
// Set the OOD evaluation point for layer above.
127-
let challenge = channel.draw_felt();
127+
let challenge = channel.draw_secure_felt();
128128
ood_point = sumcheck_ood_point;
129129
ood_point.push(challenge);
130130

@@ -293,8 +293,8 @@ mod tests {
293293
fn prove_batch_works() -> Result<(), GkrError> {
294294
const LOG_N: usize = 5;
295295
let mut channel = test_channel();
296-
let col0 = Mle::<CpuBackend, SecureField>::new(channel.draw_felts(1 << LOG_N));
297-
let col1 = Mle::<CpuBackend, SecureField>::new(channel.draw_felts(1 << LOG_N));
296+
let col0 = Mle::<CpuBackend, SecureField>::new(channel.draw_secure_felts(1 << LOG_N));
297+
let col1 = Mle::<CpuBackend, SecureField>::new(channel.draw_secure_felts(1 << LOG_N));
298298
let product0 = col0.iter().product::<SecureField>();
299299
let product1 = col1.iter().product::<SecureField>();
300300
let input_layers = vec![
@@ -326,8 +326,8 @@ mod tests {
326326
const LOG_N0: usize = 5;
327327
const LOG_N1: usize = 7;
328328
let mut channel = test_channel();
329-
let col0 = Mle::<CpuBackend, SecureField>::new(channel.draw_felts(1 << LOG_N0));
330-
let col1 = Mle::<CpuBackend, SecureField>::new(channel.draw_felts(1 << LOG_N1));
329+
let col0 = Mle::<CpuBackend, SecureField>::new(channel.draw_secure_felts(1 << LOG_N0));
330+
let col1 = Mle::<CpuBackend, SecureField>::new(channel.draw_secure_felts(1 << LOG_N1));
331331
let product0 = col0.iter().product::<SecureField>();
332332
let product1 = col1.iter().product::<SecureField>();
333333
let input_layers = vec![

‎crates/prover/src/core/lookups/sumcheck.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ pub fn prove_batch<O: MultivariatePolyOracle>(
103103

104104
channel.mix_felts(&round_poly);
105105

106-
let challenge = channel.draw_felt();
106+
let challenge = channel.draw_secure_felt();
107107

108108
claims = this_round_polys
109109
.iter()
@@ -169,7 +169,7 @@ pub fn partially_verify(
169169
}
170170

171171
channel.mix_felts(round_poly);
172-
let challenge = channel.draw_felt();
172+
let challenge = channel.draw_secure_felt();
173173
claim = round_poly.eval_at_point(challenge);
174174
assignment.push(challenge);
175175
}
@@ -215,7 +215,7 @@ mod tests {
215215

216216
#[test]
217217
fn sumcheck_works() {
218-
let values = test_channel().draw_felts(32);
218+
let values = test_channel().draw_secure_felts(32);
219219
let claim = values.iter().sum();
220220
let mle = Mle::<CpuBackend, SecureField>::new(values);
221221
let lambda = SecureField::one();
@@ -229,13 +229,13 @@ mod tests {
229229
#[test]
230230
fn batch_sumcheck_works() {
231231
let mut channel = test_channel();
232-
let values0 = channel.draw_felts(32);
233-
let values1 = channel.draw_felts(32);
232+
let values0 = channel.draw_secure_felts(32);
233+
let values1 = channel.draw_secure_felts(32);
234234
let claim0 = values0.iter().sum();
235235
let claim1 = values1.iter().sum();
236236
let mle0 = Mle::<CpuBackend, SecureField>::new(values0.clone());
237237
let mle1 = Mle::<CpuBackend, SecureField>::new(values1.clone());
238-
let lambda = channel.draw_felt();
238+
let lambda = channel.draw_secure_felt();
239239
let claims = vec![claim0, claim1];
240240
let mles = vec![mle0.clone(), mle1.clone()];
241241
let (proof, ..) = prove_batch(claims, mles, lambda, &mut test_channel());
@@ -251,13 +251,13 @@ mod tests {
251251
#[test]
252252
fn batch_sumcheck_with_different_n_variables() {
253253
let mut channel = test_channel();
254-
let values0 = channel.draw_felts(64);
255-
let values1 = channel.draw_felts(32);
254+
let values0 = channel.draw_secure_felts(64);
255+
let values1 = channel.draw_secure_felts(32);
256256
let claim0 = values0.iter().sum();
257257
let claim1 = values1.iter().sum();
258258
let mle0 = Mle::<CpuBackend, SecureField>::new(values0.clone());
259259
let mle1 = Mle::<CpuBackend, SecureField>::new(values1.clone());
260-
let lambda = channel.draw_felt();
260+
let lambda = channel.draw_secure_felt();
261261
let claims = vec![claim0, claim1];
262262
let mles = vec![mle0.clone(), mle1.clone()];
263263
let (proof, ..) = prove_batch(claims, mles, lambda, &mut test_channel());
@@ -272,7 +272,7 @@ mod tests {
272272

273273
#[test]
274274
fn invalid_sumcheck_proof_fails() {
275-
let values = test_channel().draw_felts(8);
275+
let values = test_channel().draw_secure_felts(8);
276276
let claim = values.iter().sum::<SecureField>();
277277
let lambda = SecureField::one();
278278
// Compromise the first value.

0 commit comments

Comments
 (0)