Skip to content

fix!: Use explicit types for constants #15

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 3 commits into from
Mar 12, 2026
Merged

fix!: Use explicit types for constants #15

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
f87fb26
Use explicit types for constants for breaking language change
jfecher Mar 12, 2026
da59f58
chore!: bump minimum tested version
TomAFrench Mar 12, 2026
45d88ad
fmt
TomAFrench Mar 12, 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,12 +2,12 @@ name: Noir tests

on:
push:
branches:
- master
branches:
- master
pull_request:

env:
MINIMUM_NOIR_VERSION: v1.0.0-beta.5
MINIMUM_NOIR_VERSION: v1.0.0-beta.18

jobs:
noir-version-list:
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
uses: noir-lang/noirup@v0.1.4
with:
toolchain: ${{ matrix.toolchain }}

- name: Setup Node.js
uses: actions/setup-node@v4
with:
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Install dependencies
run: |
yarn --immutable

- name: Run all tests (including oracle tests)
working-directory: ./scripts
run: ./run.sh
Expand Down
17 changes: 9 additions & 8 deletions src/lib.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ pub fn sha512_compression(_input: INT_BLOCK, _state: STATE) -> STATE {
h: encode_e(_state[7] as Field),
};

let mut w: [Field; 80] = extend_message(message_input);

let w: [Field; 80] = extend_message(message_input);
compress(&mut state, w);

let mut output: STATE = [0; 8];
Expand Down Expand Up @@ -78,7 +77,8 @@ fn digest<let N: u32, let IS_SHA512: u1>(msg: [u8; N]) -> [u8; 64] {
let num_blocks = (N + SHA512_LENGTH_PARAMETER_BYTES + SHA512_BLOCK_SIZE) / SHA512_BLOCK_SIZE;

let num_padded_bytes = num_blocks * SHA512_BLOCK_SIZE;
let mut padded_msg: [u8; ((N + SHA512_LENGTH_PARAMETER_BYTES + SHA512_BLOCK_SIZE) / SHA512_BLOCK_SIZE) * SHA512_BLOCK_SIZE] = [
let mut padded_msg
: [u8; ((N + SHA512_LENGTH_PARAMETER_BYTES + SHA512_BLOCK_SIZE) / SHA512_BLOCK_SIZE) * SHA512_BLOCK_SIZE] = [
0; ((N + SHA512_LENGTH_PARAMETER_BYTES + SHA512_BLOCK_SIZE) / SHA512_BLOCK_SIZE)
* SHA512_BLOCK_SIZE
];
Expand Down Expand Up @@ -133,7 +133,8 @@ fn digest_var<let N: u32, let IS_SHA512: u1>(msg: BoundedVec<u8, N>) -> [u8; 64]

let num_blocks = (N + SHA512_LENGTH_PARAMETER_BYTES + SHA512_BLOCK_SIZE) / SHA512_BLOCK_SIZE;

let mut padded_msg: [u8; ((N + SHA512_LENGTH_PARAMETER_BYTES + SHA512_BLOCK_SIZE) / SHA512_BLOCK_SIZE) * SHA512_BLOCK_SIZE] = [
let mut padded_msg
: [u8; ((N + SHA512_LENGTH_PARAMETER_BYTES + SHA512_BLOCK_SIZE) / SHA512_BLOCK_SIZE) * SHA512_BLOCK_SIZE] = [
0; ((N + SHA512_LENGTH_PARAMETER_BYTES + SHA512_BLOCK_SIZE) / SHA512_BLOCK_SIZE)
* SHA512_BLOCK_SIZE
];
Expand Down Expand Up @@ -189,11 +190,11 @@ fn digest_var<let N: u32, let IS_SHA512: u1>(msg: BoundedVec<u8, N>) -> [u8; 64]
/// methods here are interface-compatible with sha256 blackbox fns
pub mod sha512 {
pub fn digest<let N: u32>(msg: [u8; N]) -> [u8; 64] {
crate::digest::<_, 1>(msg)
crate::digest::<_, 1_u1>(msg)
}

pub fn sha512_var<let N: u32>(msg: BoundedVec<u8, N>) -> [u8; 64] {
crate::digest_var::<_, 1>(msg)
crate::digest_var::<_, 1_u1>(msg)
}

// Fuzz testing the sha512 implementation
Expand Down Expand Up @@ -287,7 +288,7 @@ pub mod sha512 {

pub mod sha384 {
pub fn digest<let N: u32>(msg: [u8; N]) -> [u8; 48] {
let full_result = crate::digest::<_, 0>(msg);
let full_result = crate::digest::<_, 0_u1>(msg);
let mut r: [u8; 48] = [0; 48];
for i in 0..48 {
r[i] = full_result[i];
Expand All @@ -296,7 +297,7 @@ pub mod sha384 {
}

pub fn sha384_var<let N: u32>(msg: BoundedVec<u8, N>) -> [u8; 48] {
let full_result = crate::digest_var::<_, 0>(msg);
let full_result = crate::digest_var::<_, 0_u1>(msg);
let mut r: [u8; 48] = [0; 48];
for i in 0..48 {
r[i] = full_result[i];
Expand Down
Loading