Skip to content

chore!: update to use new stdlib methods #31

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
TomAFrench merged 2 commits into from
Jun 26, 2026
Merged

chore!: update to use new stdlib methods #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55d4438
chore!: update to use new stdlib methods
TomAFrench Jun 26, 2026
27e68f9
chore: update minimum noir version
TomAFrench Jun 26, 2026
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
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: Noir tests

on:
push:
branches:
- main
branches:
- main
pull_request:

env:
CARGO_TERM_COLOR: always
MINIMUM_NOIR_VERSION: v0.36.0
MINIMUM_NOIR_VERSION: v1.0.0-beta.18

jobs:
noir-version-list:
Expand All @@ -20,7 +20,7 @@ jobs:
steps:
- name: Get supported Noir versions
id: get_versions
run: |
run: |
# gh returns the Noir releases in reverse chronological order so we keep all releases published after the minimum supported version.
VERSIONS=$(gh release list -R noir-lang/noir --exclude-pre-releases --json tagName -q 'map(.tagName) | index(env.MINIMUM_NOIR_VERSION) as $index | if $index then .[0:$index+1] else [env.MINIMUM_NOIR_VERSION] end')
echo "versions=$VERSIONS"
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
runs-on: ubuntu-latest
# We want this job to always run (even if the dependant jobs fail) as we want this job to fail rather than skipping.
if: ${{ always() }}
needs:
needs:
- test
- format

Expand Down
2 changes: 1 addition & 1 deletion Nargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
name = "noir_string_search"
type = "lib"
authors = [""]
compiler_version = ">=0.36.0"
compiler_version = ">=1.0.0"

[dependencies]
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Features:

## Noir version compatibility

This library is tested with all Noir stable releases from v0.36.0.
This library is tested with all Noir stable releases from v1.0.0-beta.18.

## Typedefs

Expand Down
36 changes: 18 additions & 18 deletions src/lib.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ impl<let MaxPaddedBytes: u32, let PaddedChunksMinusOne: u32, let MaxBytes: u32>
self.body[idx]
}
fn get_body(self) -> [u8] {
let x = self.body.as_slice();
let x = self.body.as_vector();
x
}

Expand All @@ -189,7 +189,7 @@ impl<let MaxPaddedBytes: u32, let PaddedChunksMinusOne: u32, let MaxBytes: u32>
for j in 0..31 {
slice *= 256;
let substring_idx = starting_needle_byte + (i * 31) + j;
let mut byte = self.body[substring_idx];
let byte = self.body[substring_idx];
slice += byte as Field;
}
std::as_witness(slice);
Expand Down Expand Up @@ -240,8 +240,8 @@ impl<let MaxPaddedBytes: u32, let PaddedChunks: u32, let MaxBytes: u32> StringBo
// use unconstrained function to determine:
// a: is the substring present in the body text
// b: the position of the first match in the body text
// Safety: The rest of this function checks this.
let position: u32 = unsafe {
// Safety: The rest of this function checks this.
utils::search(
self.body,
substring.get_body(),
Expand Down Expand Up @@ -346,7 +346,7 @@ impl<let MaxPaddedBytes: u32, let PaddedChunks: u32, let MaxBytes: u32> StringBo
// this requires some complex logic to determine where we are sourcing the needle bytes from.
// Either they come from the `initial_chunk`, the haystack bytes or the substring bytes.
for i in 0..31 {
let mut lhs_index = starting_needle_byte_index_of_final_chunk + i;
let lhs_index = starting_needle_byte_index_of_final_chunk + i;
let predicate = lhs_index < substring_length;
/*
| merge_initial_final_needle_chunks | predicate | byte_source |
Expand Down Expand Up @@ -450,8 +450,8 @@ fn test() {
.as_bytes();
let needle_text = " dolor in reprehenderit in voluptate velit esse".as_bytes();

let mut haystack: StringBody512 = StringBody::new(haystack_text, haystack_text.len());
let mut needle: SubString64 = SubString::new(needle_text, needle_text.len());
let haystack: StringBody512 = StringBody::new(haystack_text, haystack_text.len());
let needle: SubString64 = SubString::new(needle_text, needle_text.len());

let result = haystack.substring_match(needle);
assert(result.0 == true);
Expand All @@ -462,8 +462,8 @@ fn test_small_needle() {
let haystack_text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
.as_bytes();
let needle_text = "olor".as_bytes();
let mut haystack: StringBody512 = StringBody::new(haystack_text, haystack_text.len());
let mut needle: SubString32 = SubString::new(needle_text, needle_text.len());
let haystack: StringBody512 = StringBody::new(haystack_text, haystack_text.len());
let needle: SubString32 = SubString::new(needle_text, needle_text.len());

let result = haystack.substring_match(needle);
assert(result.0 == true);
Expand All @@ -474,8 +474,8 @@ fn test_needle_aligned_on_byte_boundary() {
let haystack_text = "the quick brown fox jumped over the lazy dog".as_bytes();
let needle_text = " the lazy dog".as_bytes();

let mut haystack: StringBody256 = StringBody::new(haystack_text, haystack_text.len());
let mut needle: SubString256 = SubString::new(needle_text, needle_text.len());
let haystack: StringBody256 = StringBody::new(haystack_text, haystack_text.len());
let needle: SubString256 = SubString::new(needle_text, needle_text.len());

let result = haystack.substring_match(needle);
assert(result.0 == true);
Expand All @@ -487,8 +487,8 @@ fn test_needle_haystack_equal_size() {
"the quick brown fox jumped over the lazy dog lorem ipsum blahhhh".as_bytes();
let needle_text = "the quick brown fox jumped over the lazy dog lorem ipsum blahhhh".as_bytes();

let mut haystack: StringBody64 = StringBody::new(haystack_text, haystack_text.len());
let mut needle: SubString64 = SubString::new(needle_text, needle_text.len());
let haystack: StringBody64 = StringBody::new(haystack_text, haystack_text.len());
let needle: SubString64 = SubString::new(needle_text, needle_text.len());

let result = haystack.substring_match(needle);
assert(result.0 == true);
Expand Down Expand Up @@ -551,12 +551,12 @@ fn test_concat_into() {
#[test]
unconstrained fn test_partial_match() {
let mut Engine = DebugRandomEngine { seed: 0 };
let mut foo: [u8; 1024] = Engine.get_random_bytes();
let foo: [u8; 1024] = Engine.get_random_bytes();
let mut bar: [u8; 128] = [0; 128];
for i in 0..128 {
bar[i] = foo[i + 123];
}
let position = utils::search(foo, bar.as_slice(), 1024, 128);
let position = utils::search(foo, bar.as_vector(), 1024, 128);

assert(position == 123);
}
Expand All @@ -567,8 +567,8 @@ fn test_substring_from_bounded_vec() {
.as_bytes();
let needle_text = " dolor in reprehenderit in voluptate velit esse".as_bytes();

let mut haystack: StringBody512 = BoundedVec::from(haystack_text).into();
let mut needle: SubString64 = BoundedVec::from(needle_text).into();
let haystack: StringBody512 = BoundedVec::from(haystack_text).into();
let needle: SubString64 = BoundedVec::from(needle_text).into();

let result = haystack.substring_match(needle);
assert(result.0 == true);
Expand All @@ -579,9 +579,9 @@ fn test_string_body_from_bounded_vec() {
let haystack_text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
.as_bytes();

let mut haystack: StringBody512 = BoundedVec::from(haystack_text).into();
let haystack: StringBody512 = BoundedVec::from(haystack_text).into();
let needle_text = " dolor in reprehenderit in voluptate velit esse".as_bytes();
let mut needle: SubString64 = BoundedVec::from(needle_text).into();
let needle: SubString64 = BoundedVec::from(needle_text).into();

let result = haystack.substring_match(needle);
assert(result.0 == true);
Expand Down
11 changes: 1 addition & 10 deletions src/utils.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub unconstrained fn search<let N: u32>(
}

unconstrained fn __conditional_select(lhs: u8, rhs: u8, predicate: bool) -> u8 {
if (predicate) {
if predicate {
lhs
} else {
rhs
Expand Down Expand Up @@ -63,15 +63,6 @@ impl DebugRandomEngine {
let hash: [u8; 32] = std::hash::blake3(input);
hash
}
unconstrained fn get_random_field(&mut self) -> Field {
let hash = self.get_random_32_bytes();
let mut result: Field = 0;
for i in 0..32 {
result *= 256;
result += hash[i] as Field;
}
result
}

pub unconstrained fn get_random_bytes<let NBytes: u32>(&mut self) -> [u8; NBytes] {
let num_chunks = (NBytes / 32) + ((NBytes % 32) != 0) as u32;
Expand Down
Loading