Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion light-poseidon/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ pub fn validate_bytes_length<F>(input: &[u8]) -> Result<&[u8], PoseidonError>
where
F: PrimeField,
{
let modulus_bytes_len = ((F::MODULUS_BIT_SIZE + 7) / 8) as usize;
let modulus_bytes_len = F::MODULUS_BIT_SIZE.div_ceil(8) as usize;
if input.is_empty() {
return Err(PoseidonError::EmptyInput);
}
Expand Down
52 changes: 26 additions & 26 deletions light-poseidon/src/parameters/bn254_x5.rs
Original file line number Diff line number Diff line change
Expand Up @@ -842,14 +842,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
])),
],
];
return Ok(crate::PoseidonParameters::new(
Ok(crate::PoseidonParameters::new(
ark,
mds,
FULL_ROUNDS,
PARTIAL_ROUNDS[0],
t.into(),
ALPHA,
));
))
} else if 3 == t {
let ark = vec![
F::from(ark_ff::BigInteger256::new([
Expand Down Expand Up @@ -2085,14 +2085,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
])),
],
];
return Ok(crate::PoseidonParameters::new(
Ok(crate::PoseidonParameters::new(
ark,
mds,
FULL_ROUNDS,
PARTIAL_ROUNDS[1],
t.into(),
ALPHA,
));
))
} else if 4 == t {
let ark = vec![
F::from(ark_ff::BigInteger256::new([
Expand Down Expand Up @@ -3738,14 +3738,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
])),
],
];
return Ok(crate::PoseidonParameters::new(
Ok(crate::PoseidonParameters::new(
ark,
mds,
FULL_ROUNDS,
PARTIAL_ROUNDS[2],
t.into(),
ALPHA,
));
))
} else if 5 == t {
let ark = vec![
F::from(ark_ff::BigInteger256::new([
Expand Down Expand Up @@ -5951,14 +5951,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
])),
],
];
return Ok(crate::PoseidonParameters::new(
Ok(crate::PoseidonParameters::new(
ark,
mds,
FULL_ROUNDS,
PARTIAL_ROUNDS[3],
t.into(),
ALPHA,
));
))
} else if 6 == t {
let ark = vec![
F::from(ark_ff::BigInteger256::new([
Expand Down Expand Up @@ -8640,14 +8640,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
])),
],
];
return Ok(crate::PoseidonParameters::new(
Ok(crate::PoseidonParameters::new(
ark,
mds,
FULL_ROUNDS,
PARTIAL_ROUNDS[4],
t.into(),
ALPHA,
));
))
} else if 7 == t {
let ark = vec![
F::from(ark_ff::BigInteger256::new([
Expand Down Expand Up @@ -11943,14 +11943,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
])),
],
];
return Ok(crate::PoseidonParameters::new(
Ok(crate::PoseidonParameters::new(
ark,
mds,
FULL_ROUNDS,
PARTIAL_ROUNDS[5],
t.into(),
ALPHA,
));
))
} else if 8 == t {
let ark = vec![
F::from(ark_ff::BigInteger256::new([
Expand Down Expand Up @@ -15812,14 +15812,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
])),
],
];
return Ok(crate::PoseidonParameters::new(
Ok(crate::PoseidonParameters::new(
ark,
mds,
FULL_ROUNDS,
PARTIAL_ROUNDS[6],
t.into(),
ALPHA,
));
))
} else if 9 == t {
let ark = vec![
F::from(ark_ff::BigInteger256::new([
Expand Down Expand Up @@ -20163,14 +20163,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
])),
],
];
return Ok(crate::PoseidonParameters::new(
Ok(crate::PoseidonParameters::new(
ark,
mds,
FULL_ROUNDS,
PARTIAL_ROUNDS[7],
t.into(),
ALPHA,
));
))
} else if 10 == t {
let ark = vec![
F::from(ark_ff::BigInteger256::new([
Expand Down Expand Up @@ -24876,14 +24876,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
])),
],
];
return Ok(crate::PoseidonParameters::new(
Ok(crate::PoseidonParameters::new(
ark,
mds,
FULL_ROUNDS,
PARTIAL_ROUNDS[8],
t.into(),
ALPHA,
));
))
} else if 11 == t {
let ark = vec![
F::from(ark_ff::BigInteger256::new([
Expand Down Expand Up @@ -30521,14 +30521,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
])),
],
];
return Ok(crate::PoseidonParameters::new(
Ok(crate::PoseidonParameters::new(
ark,
mds,
FULL_ROUNDS,
PARTIAL_ROUNDS[9],
t.into(),
ALPHA,
));
))
} else if 12 == t {
let ark = vec![
F::from(ark_ff::BigInteger256::new([
Expand Down Expand Up @@ -36318,14 +36318,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
])),
],
];
return Ok(crate::PoseidonParameters::new(
Ok(crate::PoseidonParameters::new(
ark,
mds,
FULL_ROUNDS,
PARTIAL_ROUNDS[10],
t.into(),
ALPHA,
));
))
} else if 13 == t {
let ark = vec![
F::from(ark_ff::BigInteger256::new([
Expand Down Expand Up @@ -43065,18 +43065,18 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
])),
],
];
return Ok(crate::PoseidonParameters::new(
Ok(crate::PoseidonParameters::new(
ark,
mds,
FULL_ROUNDS,
PARTIAL_ROUNDS[11],
t.into(),
ALPHA,
));
))
} else {
return Err(PoseidonError::InvalidWidthCircom {
Err(PoseidonError::InvalidWidthCircom {
width: t as usize,
max_limit: 13usize,
});
})
}
}
8 changes: 4 additions & 4 deletions xtask/src/generate_parameters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,24 +210,24 @@ pub fn generate_parameters(_opts: Options) -> Result<(), anyhow::Error> {
}
}
code += &format!(
"return Ok(crate::PoseidonParameters::new(
"Ok(crate::PoseidonParameters::new(
ark,
mds,
FULL_ROUNDS,
PARTIAL_ROUNDS[{}],
t.into(),
ALPHA,
));\n",
))\n",
t - 2
);

code += "\t}\n";
}
code += "else {
return Err(PoseidonError::InvalidWidthCircom {
Err(PoseidonError::InvalidWidthCircom {
width: t as usize,
max_limit: 13usize,
});\n
})\n
}";
code += "}\n";

Expand Down
Loading