Skip to content

Commit 70e276b

Browse files
ed255ed255
committed
rename StatementTmplArg::WildcardValue to StatementTmplArg::Wildcard
1 parent bec3f78 commit 70e276b

File tree

6 files changed

+34
-36
lines changed

6 files changed

+34
-36
lines changed

‎src/backends/plonky2/circuits/mainpod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2565,7 +2565,7 @@ mod tests {
25652565
helper_statement_arg_from_template(&params, st_tmpl_arg, args, expected_st_arg)?;
25662566

25672567
// case: WildcardLiteral(wildcard)
2568-
let st_tmpl_arg = StatementTmplArg::WildcardLiteral(Wildcard::new("a".to_string(), 1));
2568+
let st_tmpl_arg = StatementTmplArg::Wildcard(Wildcard::new("a".to_string(), 1));
25692569
let args = vec![Value::from(1), Value::from("key"), Value::from(3)];
25702570
let expected_st_arg = StatementArg::Literal(Value::from("key"));
25712571
helper_statement_arg_from_template(&params, st_tmpl_arg, args, expected_st_arg)?;

‎src/frontend/custom.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ impl CustomPredicateBatchBuilder {
185185
Key::from(key_str),
186186
),
187187
BuilderArg::WildcardLiteral(v) => {
188-
StatementTmplArg::WildcardLiteral(resolve_wildcard(args, priv_args, v))
188+
StatementTmplArg::Wildcard(resolve_wildcard(args, priv_args, v))
189189
}
190190
})
191191
.collect();

‎src/lang/mod.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ mod tests {
4545
}
4646

4747
fn sta_wc_lit(name: &str, index: usize) -> StatementTmplArg {
48-
StatementTmplArg::WildcardLiteral(wc(name, index))
48+
StatementTmplArg::Wildcard(wc(name, index))
4949
}
5050

5151
fn sta_lit(value: impl Into<Value>) -> StatementTmplArg {
@@ -247,8 +247,8 @@ mod tests {
247247
let expected_request_templates = vec![StatementTmpl {
248248
pred: Predicate::Custom(CustomPredicateRef::new(expected_batch, 0)),
249249
args: vec![
250-
StatementTmplArg::WildcardLiteral(wc("Pod1", 0)),
251-
StatementTmplArg::WildcardLiteral(wc("Pod2", 1)),
250+
StatementTmplArg::Wildcard(wc("Pod1", 0)),
251+
StatementTmplArg::Wildcard(wc("Pod2", 1)),
252252
],
253253
}];
254254

@@ -291,7 +291,7 @@ mod tests {
291291
StatementTmpl {
292292
pred: Predicate::Custom(CustomPredicateRef::new(batch_result, 0)), // Refers to some_pred
293293
args: vec![
294-
StatementTmplArg::WildcardLiteral(wc("Var1", 0)), // ?Var1
294+
StatementTmplArg::Wildcard(wc("Var1", 0)), // ?Var1
295295
StatementTmplArg::Literal(Value::from(12345i64)), // 12345
296296
StatementTmplArg::Literal(Value::from("hello_string")), // "hello_string"
297297
],
@@ -728,8 +728,8 @@ mod tests {
728728
let expected_request_templates = vec![StatementTmpl {
729729
pred: Predicate::Custom(CustomPredicateRef::new(available_batch, 0)),
730730
args: vec![
731-
StatementTmplArg::WildcardLiteral(wc("Pod1", 0)),
732-
StatementTmplArg::WildcardLiteral(wc("Pod2", 1)),
731+
StatementTmplArg::Wildcard(wc("Pod1", 0)),
732+
StatementTmplArg::Wildcard(wc("Pod2", 1)),
733733
],
734734
}];
735735

@@ -776,11 +776,11 @@ mod tests {
776776
let expected_templates = vec![
777777
StatementTmpl {
778778
pred: Predicate::Custom(CustomPredicateRef::new(available_batch.clone(), 0)),
779-
args: vec![StatementTmplArg::WildcardLiteral(wc("Pod1", 0))],
779+
args: vec![StatementTmplArg::Wildcard(wc("Pod1", 0))],
780780
},
781781
StatementTmpl {
782782
pred: Predicate::Custom(CustomPredicateRef::new(available_batch, 2)),
783-
args: vec![StatementTmplArg::WildcardLiteral(wc("Pod2", 1))],
783+
args: vec![StatementTmplArg::Wildcard(wc("Pod2", 1))],
784784
},
785785
];
786786

@@ -844,8 +844,8 @@ mod tests {
844844
let expected_statement = StatementTmpl {
845845
pred: Predicate::Custom(CustomPredicateRef::new(available_batch.clone(), 0)),
846846
args: vec![
847-
StatementTmplArg::WildcardLiteral(wc("X", 0)),
848-
StatementTmplArg::WildcardLiteral(wc("Y", 1)),
847+
StatementTmplArg::Wildcard(wc("X", 0)),
848+
StatementTmplArg::Wildcard(wc("Y", 1)),
849849
],
850850
};
851851

‎src/lang/processor.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ fn resolve_request_statement_builder(
842842
}
843843
BuilderArg::WildcardLiteral(wc_name) => {
844844
let wc = resolve_wildcard(ordered_request_wildcard_names, &wc_name)?;
845-
StatementTmplArg::WildcardLiteral(wc)
845+
StatementTmplArg::Wildcard(wc)
846846
}
847847
};
848848
middleware_args.push(mw_arg);

‎src/middleware/custom.rs‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,9 @@ impl ToFields for Wildcard {
4242
pub enum StatementTmplArg {
4343
None,
4444
Literal(Value),
45-
// AnchoredKey
45+
// AnchoredKey where the origin is a wildcard
4646
AnchoredKey(Wildcard, Key),
47-
// TODO: This naming is a bit confusing: a WildcardLiteral that contains a Wildcard...
48-
// Could we merge WildcardValue and Value and allow wildcard value apart from pod_id and key?
49-
WildcardLiteral(Wildcard),
47+
Wildcard(Wildcard),
5048
}
5149

5250
#[derive(Clone, Copy)]
@@ -95,7 +93,7 @@ impl ToFields for StatementTmplArg {
9593
.collect();
9694
fields
9795
}
98-
StatementTmplArg::WildcardLiteral(wc) => {
96+
StatementTmplArg::Wildcard(wc) => {
9997
let fields: Vec<F> = iter::once(F::from(StatementTmplArgPrefix::WildcardLiteral))
10098
.chain(wc.to_fields(params))
10199
.chain(iter::repeat(F::ZERO))
@@ -118,7 +116,7 @@ impl fmt::Display for StatementTmplArg {
118116
key.fmt(f)?;
119117
write!(f, "]")
120118
}
121-
Self::WildcardLiteral(v) => v.fmt(f),
119+
Self::Wildcard(v) => v.fmt(f),
122120
}
123121
}
124122
}
@@ -530,14 +528,14 @@ mod tests {
530528
P::Native(NP::Equal),
531529
vec![
532530
STA::AnchoredKey(wc(2), Key::from("_signer")),
533-
STA::WildcardLiteral(wc(0)),
531+
STA::Wildcard(wc(0)),
534532
],
535533
),
536534
st(
537535
P::Native(NP::Equal),
538536
vec![
539537
STA::AnchoredKey(wc(2), Key::from("attestation")),
540-
STA::WildcardLiteral(wc(1)),
538+
STA::Wildcard(wc(1)),
541539
],
542540
),
543541
],
@@ -555,11 +553,11 @@ mod tests {
555553
vec![
556554
st(
557555
P::Native(NP::Equal),
558-
vec![STA::WildcardLiteral(wc(0)), STA::WildcardLiteral(wc(1))],
556+
vec![STA::Wildcard(wc(0)), STA::Wildcard(wc(1))],
559557
),
560558
st(
561559
P::Native(NP::Equal),
562-
vec![STA::WildcardLiteral(wc(2)), STA::Literal(0.into())],
560+
vec![STA::Wildcard(wc(2)), STA::Literal(0.into())],
563561
),
564562
],
565563
3,
@@ -574,22 +572,22 @@ mod tests {
574572
st(
575573
P::BatchSelf(2),
576574
vec![
577-
STA::WildcardLiteral(wc(0)),
578-
STA::WildcardLiteral(wc(4)),
579-
STA::WildcardLiteral(wc(3)),
575+
STA::Wildcard(wc(0)),
576+
STA::Wildcard(wc(4)),
577+
STA::Wildcard(wc(3)),
580578
],
581579
),
582580
st(
583581
P::Native(NP::SumOf),
584582
vec![
585-
STA::WildcardLiteral(wc(2)),
586-
STA::WildcardLiteral(wc(3)),
583+
STA::Wildcard(wc(2)),
584+
STA::Wildcard(wc(3)),
587585
STA::Literal(Value::from(1)),
588586
],
589587
),
590588
st(
591589
P::Custom(CustomPredicateRef::new(eth_friend_batch.clone(), 0)),
592-
vec![STA::WildcardLiteral(wc(4)), STA::WildcardLiteral(wc(1))],
590+
vec![STA::Wildcard(wc(4)), STA::Wildcard(wc(1))],
593591
),
594592
],
595593
3,
@@ -604,17 +602,17 @@ mod tests {
604602
st(
605603
P::BatchSelf(0),
606604
vec![
607-
STA::WildcardLiteral(wc(0)),
608-
STA::WildcardLiteral(wc(1)),
609-
STA::WildcardLiteral(wc(2)),
605+
STA::Wildcard(wc(0)),
606+
STA::Wildcard(wc(1)),
607+
STA::Wildcard(wc(2)),
610608
],
611609
),
612610
st(
613611
P::BatchSelf(1),
614612
vec![
615-
STA::WildcardLiteral(wc(0)),
616-
STA::WildcardLiteral(wc(1)),
617-
STA::WildcardLiteral(wc(2)),
613+
STA::Wildcard(wc(0)),
614+
STA::Wildcard(wc(1)),
615+
STA::Wildcard(wc(2)),
618616
],
619617
),
620618
],

‎src/middleware/operation.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ pub fn check_st_tmpl(
394394
let pod_id_ok = check_or_set(Value::from(*pod_id), pod_id_wc, wildcard_map);
395395
pod_id_ok && (key_tmpl == key)
396396
}
397-
(StatementTmplArg::WildcardLiteral(wc), StatementArg::Literal(v)) => {
397+
(StatementTmplArg::Wildcard(wc), StatementArg::Literal(v)) => {
398398
check_or_set(v.clone(), wc, wildcard_map)
399399
}
400400
_ => {

0 commit comments

Comments
 (0)