arnaucube/ark-r1cs-std
1
0
Fork 0
mirror of https://github.com/arnaucube/ark-r1cs-std.git synced 2026-01-10 16:01:28 +01:00
Code Issues Projects Releases Wiki Activity

Prefer to return error rather than ? them,

Browse Source 
avoid return when it cant be early (in a simple if-else)
This commit is contained in:
François Garillot
2019-12-02 07:21:10 -08:00
committed by Pratyush Mishra
parent 10c6e85c1a
commit d71bc5a675
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crypto-primitives/src/merkle_tree/mod.rs
View File

@@ -200,7 +200,7 @@ impl<P: MerkleTreeConfig> MerkleHashTree<P> {
// Check that the given index corresponds to the correct leaf.
if leaf_hash != self.tree[tree_index] {
Err(MerkleTreeError::IncorrectLeafIndex(tree_index))?
return Err(MerkleTreeError::IncorrectLeafIndex(tree_index).into())
}
// Iterate from the leaf up to the root, storing all intermediate hash values.
@@ -230,7 +230,7 @@ impl<P: MerkleTreeConfig> MerkleHashTree<P> {
}
end_timer!(prove_time);
if path.len() != (Self::HEIGHT - 1) as usize {
Err(MerkleTreeError::IncorrectPathLength(path.len()))?
return Err(MerkleTreeError::IncorrectPathLength(path.len()).into())
} else {
Ok(MerkleTreePath { path })
}

2
r1cs-std/src/bits/boolean.rs
View File

@@ -681,7 +681,7 @@ impl<ConstraintF: Field> ConditionalEqGadget<ConstraintF> for Boolean {
// 1 - 1 = 0 - 0 = 0
(Constant(true), Constant(true)) | (Constant(false), Constant(false)) => return Ok(()),
// false != true
(Constant(_), Constant(_)) => Err(SynthesisError::AssignmentMissing)?,
(Constant(_), Constant(_)) => return Err(SynthesisError::AssignmentMissing),
// 1 - a
(Constant(true), Is(a)) | (Is(a), Constant(true)) => {
LinearCombination::zero() + one - a.get_variable()