Skip to content

Commit

Permalink
chore: inline check_for_unexpected_inputs
Browse files Browse the repository at this point in the history
  • Loading branch information
TomAFrench committed Feb 17, 2023
1 parent 86210d9 commit 363035d
Showing 1 changed file with 7 additions and 13 deletions.
20 changes: 7 additions & 13 deletions crates/noirc_abi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,13 @@ impl Abi {
input_map: &InputMap,
return_value: Option<InputValue>,
) -> Result<WitnessMap, AbiError> {
self.check_for_unexpected_inputs(input_map)?;
// Check that no extra witness values have been provided.
let param_names = self.parameter_names();
if param_names.len() < input_map.len() {
let unexpected_params: Vec<String> =
input_map.keys().filter(|param| !param_names.contains(param)).cloned().collect();
return Err(AbiError::UnexpectedParams(unexpected_params));
}

// First encode each input separately, performing any input validation.
let encoded_input_map: BTreeMap<String, Vec<FieldElement>> = self
Expand Down Expand Up @@ -255,18 +261,6 @@ impl Abi {
Ok(witness_map)
}

/// Checks that no extra witness values have been provided.
fn check_for_unexpected_inputs(&self, inputs: &InputMap) -> Result<(), AbiError> {
let param_names = self.parameter_names();
if param_names.len() < inputs.len() {
let unexpected_params: Vec<String> =
inputs.keys().filter(|param| !param_names.contains(param)).cloned().collect();
return Err(AbiError::UnexpectedParams(unexpected_params));
}

Ok(())
}

fn encode_value(value: InputValue, param_name: &String) -> Result<Vec<FieldElement>, AbiError> {
let mut encoded_value = Vec::new();
match value {
Expand Down

0 comments on commit 363035d

Please sign in to comment.