Skip to content

fix: remove unused generic and specify some that can't be deduced #14277

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.

Sign up for GitHub

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

Merged
asterite merged 3 commits into from
May 13, 2025
Merged

fix: remove unused generic and specify some that can't be deduced #14277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1340d5a
Remove unused generic
asterite May 13, 2025
8f16013
Specificy some generics that cannot be deduced
asterite May 13, 2025
3ed10e0
Merge branch 'master' into ab/fix-unspecified-generics
asterite May 13, 2025
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
2 changes: 1 addition & 1 deletion ...ects/noir-protocol-circuits/crates/types/src/shared_mutable/shared_mutable_values/test.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ unconstrained fn packed_shared_mutable_values_match_typescript() {
let pre_value = MockStruct { a: 1, b: 2 };
let post_value = MockStruct { a: 3, b: 4 };

let sdc = ScheduledDelayChange::new(Option::some(1), Option::some(50), 2);
let sdc = ScheduledDelayChange::<0>::new(Option::some(1), Option::some(50), 2);
let svc = ScheduledValueChange::new(pre_value, post_value, 50);
let smv = SharedMutableValues::new(svc, sdc);

Expand Down
14 changes: 7 additions & 7 deletions noir-projects/noir-protocol-circuits/crates/types/src/shared_mutable/with_hash.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ mod tests {
next_index: 0,
};

let with_hash_hint = SharedMutableValues::new(
ScheduledValueChange::<ContractClassId>::empty(),
let with_hash_hint = SharedMutableValues::<ContractClassId, 0>::new(
ScheduledValueChange::empty(),
ScheduledDelayChange::empty(),
);

Expand Down Expand Up @@ -216,8 +216,8 @@ mod tests {
BlockHeader::empty(),
27,
AztecAddress::from_field(42),
SharedMutableValues::new(
ScheduledValueChange::<ContractClassId>::empty(),
SharedMutableValues::<ContractClassId, 0>::new(
ScheduledValueChange::empty(),
ScheduledDelayChange::empty(),
),
MembershipWitness { leaf_index: 80, sibling_path: std::mem::zeroed() },
Expand Down Expand Up @@ -252,8 +252,8 @@ mod tests {
historical_header,
with_hash_storage_slot,
contract_address,
SharedMutableValues::new(
ScheduledValueChange::<ContractClassId>::empty(),
SharedMutableValues::<ContractClassId, 0>::new(
ScheduledValueChange::empty(),
ScheduledDelayChange::empty(),
),
witness,
Expand Down Expand Up @@ -286,7 +286,7 @@ mod tests {
next_index: 0,
};
// Expected to be empty, it's not
let value_hint = SharedMutableValues::new(
let value_hint = SharedMutableValues::<ContractClassId, 0>::new(
ScheduledValueChange::new(
ContractClassId::from_field(0),
ContractClassId::from_field(96),
Expand Down
6 changes: 1 addition & 5 deletions noir-projects/noir-protocol-circuits/crates/types/src/utils/arrays.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,7 @@ where

// Helper function to check if an array is padded with a given value from a given index.
// Different to padded_array_length in that it allows the elements before the given index to be the same as the padded value.
pub fn array_padded_with<T, let N: u32, let M: u32>(
array: [T; N],
from_index: u32,
padded_with: T,
) -> bool
pub fn array_padded_with<T, let N: u32>(array: [T; N], from_index: u32, padded_with: T) -> bool
where
T: Eq,
{
Expand Down