ed255/pod2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return an error instead of panicking when too many statements (#372)

Browse source 
* Return an error instead of panicking when too many statements

* Improve clarity of variable names and error message
This commit is contained in:
Rob Knight 2025-07-30 20:21:39 +01:00 • committed by GitHub
parent ae39ff307d
commit bde35369d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/frontend/error.rs
View file

@ -35,6 +35,10 @@ pub enum InnerError {
PodlangParse(String), PodlangParse(String),
#[error("POD Request validation error: {0}")] #[error("POD Request validation error: {0}")]
PodRequestValidation(String), PodRequestValidation(String),
#[error("Too many public statements provided: {0} were provided, but the maximum is {1}")]
TooManyPublicStatements(usize, usize),
#[error("Too many statements provided: {0} were provided, but the maximum is {1}")]
TooManyStatements(usize, usize),
// Other // Other
#[error("{0}")] #[error("{0}")]
Custom(String), Custom(String),
@ -104,4 +108,10 @@ impl Error {
pub(crate) fn pod_request_validation(e: String) -> Self { pub(crate) fn pod_request_validation(e: String) -> Self {
new!(PodRequestValidation(e)) new!(PodRequestValidation(e))
} }
pub(crate) fn too_many_public_statements(found: usize, max: usize) -> Self {
new!(TooManyPublicStatements(found, max))
}
pub(crate) fn too_many_statements(found: usize, max: usize) -> Self {
new!(TooManyStatements(found, max))
}
} }

29
src/frontend/mod.rs
View file

@ -172,20 +172,27 @@ impl MainPodBuilder {
pub fn add_recursive_pod(&mut self, pod: MainPod) { pub fn add_recursive_pod(&mut self, pod: MainPod) {
self.input_recursive_pods.push(pod); self.input_recursive_pods.push(pod);
} }
pub fn insert(&mut self, public: bool, st_op: (Statement, Operation)) { pub fn insert(&mut self, public: bool, st_op: (Statement, Operation)) -> Result<()> {
// TODO: Do error handling instead of panic // TODO: Do error handling instead of panic
let (st, op) = st_op; let (st, op) = st_op;
if public { if public {
self.public_statements.push(st.clone()); self.public_statements.push(st.clone());
} }
if self.public_statements.len() > self.params.max_public_statements { if self.public_statements.len() > self.params.max_public_statements {
panic!("too many public statements"); return Err(Error::too_many_public_statements(
self.public_statements.len(),
self.params.max_public_statements,
));
} }
self.statements.push(st); self.statements.push(st);
self.operations.push(op); self.operations.push(op);
if self.statements.len() > self.params.max_statements { if self.statements.len() > self.params.max_statements {
panic!("too many statements"); return Err(Error::too_many_statements(
self.statements.len(),
self.params.max_statements,
));
} }
Ok(())
} }
pub fn pub_op(&mut self, op: Operation) -> Result<Statement> { pub fn pub_op(&mut self, op: Operation) -> Result<Statement> {
@ -511,7 +518,7 @@ impl MainPodBuilder {
fn op(&mut self, public: bool, op: Operation) -> Result<Statement> { fn op(&mut self, public: bool, op: Operation) -> Result<Statement> {
let op = Self::fill_in_aux(Self::lower_op(op)?)?; let op = Self::fill_in_aux(Self::lower_op(op)?)?;
let st = self.op_statement(op.clone())?; let st = self.op_statement(op.clone())?;
self.insert(public, (st, op)); self.insert(public, (st, op))?;
Ok(self.statements[self.statements.len() - 1].clone()) Ok(self.statements[self.statements.len() - 1].clone())
} }
@ -1273,10 +1280,10 @@ pub mod tests {
vec![], vec![],
OperationAux::None, OperationAux::None,
); );
builder.insert(false, (st, op_new_entry.clone())); builder.insert(false, (st, op_new_entry.clone())).unwrap();
let st = Statement::equal(AnchoredKey::from((SELF, "a")), Value::from(28)); let st = Statement::equal(AnchoredKey::from((SELF, "a")), Value::from(28));
builder.insert(false, (st, op_new_entry.clone())); builder.insert(false, (st, op_new_entry.clone())).unwrap();
let prover = MockProver {}; let prover = MockProver {};
let pod = builder.prove(&prover).unwrap(); let pod = builder.prove(&prover).unwrap();
@ -1301,8 +1308,12 @@ pub mod tests {
vec![], vec![],
OperationAux::None, OperationAux::None,
); );
builder.insert(false, (value_of_a.clone(), op_new_entry.clone())); builder
builder.insert(false, (value_of_b.clone(), op_new_entry)); .insert(false, (value_of_a.clone(), op_new_entry.clone()))
.unwrap();
builder
.insert(false, (value_of_b.clone(), op_new_entry))
.unwrap();
let st = Statement::equal(self_a, self_b); let st = Statement::equal(self_a, self_b);
let op = Operation( let op = Operation(
OperationType::Native(NativeOperation::EqualFromEntries), OperationType::Native(NativeOperation::EqualFromEntries),
@ -1312,7 +1323,7 @@ pub mod tests {
], ],
OperationAux::None, OperationAux::None,
); );
builder.insert(false, (st, op)); builder.insert(false, (st, op)).unwrap();
let prover = MockProver {}; let prover = MockProver {};
let pod = builder.prove(&prover).unwrap(); let pod = builder.prove(&prover).unwrap();