Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(stdlib)!: update stdlib functions to return bool where appropriate #1409

Merged
merged 2 commits into from
May 26, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/nargo_cli/tests/test_data/ecdsa_secp256k1/src/main.nr
Original file line number Diff line number Diff line change
@@ -6,6 +6,6 @@ fn main(message : [u8;38],hashed_message : [u8;32], pub_key_x : [u8;32], pub_key
let expected= std::hash::sha256(message);
assert(hashed_message == expected);

let x = std::ecdsa_secp256k1::verify_signature(pub_key_x, pub_key_y, signature, hashed_message);
assert(x == 1);
let valid_signature = std::ecdsa_secp256k1::verify_signature(pub_key_x, pub_key_y, signature, hashed_message);
assert(valid_signature);
}
2 changes: 1 addition & 1 deletion crates/nargo_cli/tests/test_data/merkle_insert/src/main.nr
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ fn main(
mimc_input: [Field; 4],
) {
let old_leaf_exists = std::merkle::check_membership(old_root, old_leaf, index, old_hash_path);
assert(old_leaf_exists == 1);
assert(old_leaf_exists);
assert(old_root == std::merkle::compute_root_from_leaf(old_leaf, index, old_hash_path));
let calculated_root = std::merkle::compute_merkle_root(leaf, index, old_hash_path);
assert(new_root == calculated_root);
4 changes: 2 additions & 2 deletions crates/nargo_cli/tests/test_data/schnorr/src/main.nr
Original file line number Diff line number Diff line change
@@ -5,6 +5,6 @@ use dep::std;
fn main(message: [u8; 10], pub_key_x: Field, pub_key_y: Field, signature: [u8; 64]) {
// Is there ever a situation where someone would want
// to ensure that a signature was invalid?
let x = std::schnorr::verify_signature(pub_key_x,pub_key_y,signature, message);
assert(x == 1);
let valid_signature = std::schnorr::verify_signature(pub_key_x,pub_key_y,signature, message);
assert(valid_signature);
}
2 changes: 1 addition & 1 deletion crates/nargo_cli/tests/test_data/simple_shield/src/main.nr
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ fn main(

// Check that the input note nullifier is in the root
let is_member = std::merkle::check_membership(note_root, note_commitment[0], index, note_hash_path);
assert(is_member == 1);
assert(is_member);

[nullifier[0], receiver_note_commitment[0]]
}
2 changes: 1 addition & 1 deletion noir_stdlib/src/ecdsa_secp256k1.nr
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#[foreign(ecdsa_secp256k1)]
fn verify_signature(_public_key_x : [u8; 32], _public_key_y : [u8; 32], _signature: [u8; 64], _message_hash: [u8]) -> Field {}
fn verify_signature(_public_key_x : [u8; 32], _public_key_y : [u8; 32], _signature: [u8; 64], _message_hash: [u8]) -> bool {}
4 changes: 2 additions & 2 deletions noir_stdlib/src/merkle.nr
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
// and the hashpath proves this
// Currently we assume that it is a binary tree, so depth k implies a width of 2^k
// XXX: In the future we can add an arity parameter
fn check_membership(_root : Field, _leaf : Field, _index : Field, _hash_path: [Field]) -> Field {
(compute_merkle_root(_leaf, _index, _hash_path) == _root) as Field
fn check_membership(_root : Field, _leaf : Field, _index : Field, _hash_path: [Field]) -> bool {
compute_merkle_root(_leaf, _index, _hash_path) == _root
}

#[foreign(compute_merkle_root)]
2 changes: 1 addition & 1 deletion noir_stdlib/src/schnorr.nr
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#[foreign(schnorr_verify)]
fn verify_signature(_public_key_x: Field, _public_key_y: Field, _signature: [u8; 64], _message: [u8]) -> Field {}
fn verify_signature(_public_key_x: Field, _public_key_y: Field, _signature: [u8; 64], _message: [u8]) -> bool {}