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.

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

CHIA-1763: Make functions use bls cache immutably #793

Merged
merged 2 commits into from
Nov 15, 2024
Merged

CHIA-1763: Make functions use bls cache immutably #793

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
038f392
Make bls cache immutable
Rigidity Nov 15, 2024
12fd04e
More mut removals
Rigidity Nov 15, 2024
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
12 changes: 6 additions & 6 deletions crates/chia-bls/benches/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ fn cache_benchmark(c: &mut Criterion) {
pks.push(pk);
}

let mut bls_cache = BlsCache::default();
let bls_cache = BlsCache::default();

c.bench_function("bls_cache.aggregate_verify, 0% cache hits", |b| {
let mut cache = bls_cache.clone();
let cache = bls_cache.clone();
b.iter(|| {
assert!(cache.aggregate_verify(pks.iter().zip([&msg].iter().cycle()), &agg_sig));
});
Expand All @@ -35,7 +35,7 @@ fn cache_benchmark(c: &mut Criterion) {
// populate 10% of keys
bls_cache.aggregate_verify(pks[0..100].iter().zip([&msg].iter().cycle()), &agg_sig);
c.bench_function("bls_cache.aggregate_verify, 10% cache hits", |b| {
let mut cache = bls_cache.clone();
let cache = bls_cache.clone();
b.iter(|| {
assert!(cache.aggregate_verify(pks.iter().zip([&msg].iter().cycle()), &agg_sig));
});
Expand All @@ -44,7 +44,7 @@ fn cache_benchmark(c: &mut Criterion) {
// populate another 10% of keys
bls_cache.aggregate_verify(pks[100..200].iter().zip([&msg].iter().cycle()), &agg_sig);
c.bench_function("bls_cache.aggregate_verify, 20% cache hits", |b| {
let mut cache = bls_cache.clone();
let cache = bls_cache.clone();
b.iter(|| {
assert!(cache.aggregate_verify(pks.iter().zip([&msg].iter().cycle()), &agg_sig));
});
Expand All @@ -53,7 +53,7 @@ fn cache_benchmark(c: &mut Criterion) {
// populate another 30% of keys
bls_cache.aggregate_verify(pks[200..500].iter().zip([&msg].iter().cycle()), &agg_sig);
c.bench_function("bls_cache.aggregate_verify, 50% cache hits", |b| {
let mut cache = bls_cache.clone();
let cache = bls_cache.clone();
b.iter(|| {
assert!(cache.aggregate_verify(pks.iter().zip([&msg].iter().cycle()), &agg_sig));
});
Expand All @@ -62,7 +62,7 @@ fn cache_benchmark(c: &mut Criterion) {
// populate all other keys
bls_cache.aggregate_verify(pks[500..1000].iter().zip([&msg].iter().cycle()), &agg_sig);
c.bench_function("bls_cache.aggregate_verify, 100% cache hits", |b| {
let mut cache = bls_cache.clone();
let cache = bls_cache.clone();
b.iter(|| {
assert!(cache.aggregate_verify(pks.iter().zip([&msg].iter().cycle()), &agg_sig));
});
Expand Down
16 changes: 8 additions & 8 deletions crates/chia-bls/src/bls_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl BlsCache {
}

pub fn aggregate_verify<Pk: Borrow<PublicKey>, Msg: AsRef<[u8]>>(
&mut self,
&self,
pks_msgs: impl IntoIterator<Item = (Pk, Msg)>,
sig: &Signature,
) -> bool {
Expand Down Expand Up @@ -82,7 +82,7 @@ impl BlsCache {
aggregate_verify_gt(sig, iter)
}

pub fn update(&mut self, aug_msg: &[u8], gt: GTElement) {
pub fn update(&self, aug_msg: &[u8], gt: GTElement) {
let mut hasher = Sha256::new();
hasher.update(aug_msg.as_ref());
let hash: [u8; 32] = hasher.finalize();
Expand Down Expand Up @@ -119,7 +119,7 @@ impl BlsCache {

#[pyo3(name = "aggregate_verify")]
pub fn py_aggregate_verify(
&mut self,
&self,
pks: &Bound<'_, PyList>,
msgs: &Bound<'_, PyList>,
sig: &Signature,
Expand Down Expand Up @@ -155,7 +155,7 @@ impl BlsCache {
}

#[pyo3(name = "update")]
pub fn py_update(&mut self, other: &Bound<'_, PySequence>) -> PyResult<()> {
pub fn py_update(&self, other: &Bound<'_, PySequence>) -> PyResult<()> {
let mut c = self.cache.lock().expect("cache");
for item in other.borrow().iter()? {
let (key, value): (Vec<u8>, GTElement) = item?.extract()?;
Expand All @@ -178,7 +178,7 @@ pub mod tests {

#[test]
fn test_aggregate_verify() {
let mut bls_cache = BlsCache::default();
let bls_cache = BlsCache::default();

let sk = SecretKey::from_seed(&[0; 32]);
let pk = sk.public_key();
Expand All @@ -201,7 +201,7 @@ pub mod tests {

#[test]
fn test_cache() {
let mut bls_cache = BlsCache::default();
let bls_cache = BlsCache::default();

let sk1 = SecretKey::from_seed(&[0; 32]);
let pk1 = sk1.public_key();
Expand Down Expand Up @@ -242,7 +242,7 @@ pub mod tests {
#[test]
fn test_cache_limit() {
// The cache is limited to only 3 items.
let mut bls_cache = BlsCache::new(NonZeroUsize::new(3).unwrap());
let bls_cache = BlsCache::new(NonZeroUsize::new(3).unwrap());

// Before we cache anything, it should be empty.
assert!(bls_cache.is_empty());
Expand Down Expand Up @@ -280,7 +280,7 @@ pub mod tests {

#[test]
fn test_empty_sig() {
let mut bls_cache = BlsCache::default();
let bls_cache = BlsCache::default();

let pks_msgs: [(&PublicKey, &[u8]); 0] = [];

Expand Down
32 changes: 16 additions & 16 deletions crates/chia-consensus/src/gen/conditions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1291,7 +1291,7 @@ pub fn parse_spends<V: SpendVisitor>(
max_cost: Cost,
flags: u32,
aggregate_signature: &Signature,
bls_cache: Option<&mut BlsCache>,
bls_cache: Option<&BlsCache>,
constants: &ConsensusConstants,
) -> Result<SpendBundleConditions, ValidationErr> {
let mut ret = SpendBundleConditions::default();
Expand Down Expand Up @@ -1503,7 +1503,7 @@ pub fn validate_signature(
state: &ParseState,
signature: &Signature,
flags: u32,
bls_cache: Option<&mut BlsCache>,
bls_cache: Option<&BlsCache>,
) -> Result<(), ValidationErr> {
if (flags & DONT_VALIDATE_SIGNATURE) != 0 {
return Ok(());
Expand Down Expand Up @@ -1766,7 +1766,7 @@ fn cond_test_cb(
flags: u32,
callback: Callback,
signature: &Signature,
bls_cache: Option<&mut BlsCache>,
bls_cache: Option<&BlsCache>,
) -> Result<(Allocator, SpendBundleConditions), ValidationErr> {
let mut a = Allocator::new();

Expand Down Expand Up @@ -1817,7 +1817,7 @@ fn cond_test_flag(
fn cond_test_sig(
input: &str,
signature: &Signature,
bls_cache: Option<&mut BlsCache>,
bls_cache: Option<&BlsCache>,
flags: u32,
) -> Result<(Allocator, SpendBundleConditions), ValidationErr> {
cond_test_cb(input, flags, None, signature, bls_cache)
Expand Down Expand Up @@ -4698,7 +4698,7 @@ fn add_signature(sig: &mut Signature, puzzle: &mut String, opcode: ConditionOpco
}

#[cfg(test)]
fn populate_cache(opcode: ConditionOpcode, bls_cache: &mut BlsCache) {
fn populate_cache(opcode: ConditionOpcode, bls_cache: &BlsCache) {
use chia_bls::hash_to_g2;
let msg = final_message(H1, H2, 123, opcode, MSG1);
// Otherwise, we need to calculate the pairing and add it to the cache.
Expand All @@ -4720,17 +4720,17 @@ fn test_agg_sig(
) {
use chia_bls::{sign, SecretKey};
let mut signature = Signature::default();
let mut bls_cache = BlsCache::default();
let cache: Option<&mut BlsCache> = if with_cache {
populate_cache(43, &mut bls_cache);
populate_cache(44, &mut bls_cache);
populate_cache(45, &mut bls_cache);
populate_cache(46, &mut bls_cache);
populate_cache(47, &mut bls_cache);
populate_cache(48, &mut bls_cache);
populate_cache(49, &mut bls_cache);
populate_cache(50, &mut bls_cache);
Some(&mut bls_cache)
let bls_cache = BlsCache::default();
let cache: Option<&BlsCache> = if with_cache {
populate_cache(43, &bls_cache);
populate_cache(44, &bls_cache);
populate_cache(45, &bls_cache);
populate_cache(46, &bls_cache);
populate_cache(47, &bls_cache);
populate_cache(48, &bls_cache);
populate_cache(49, &bls_cache);
populate_cache(50, &bls_cache);
Some(&bls_cache)
} else {
None
};
Expand Down
4 changes: 2 additions & 2 deletions crates/chia-consensus/src/gen/run_block_generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ pub fn run_block_generator<GenBuf: AsRef<[u8]>, I: IntoIterator<Item = GenBuf>>(
max_cost: u64,
flags: u32,
signature: &Signature,
bls_cache: Option<&mut BlsCache>,
bls_cache: Option<&BlsCache>,
constants: &ConsensusConstants,
) -> Result<SpendBundleConditions, ValidationErr>
where
Expand Down Expand Up @@ -166,7 +166,7 @@ pub fn run_block_generator2<GenBuf: AsRef<[u8]>, I: IntoIterator<Item = GenBuf>>
max_cost: u64,
flags: u32,
signature: &Signature,
bls_cache: Option<&mut BlsCache>,
bls_cache: Option<&BlsCache>,
constants: &ConsensusConstants,
) -> Result<SpendBundleConditions, ValidationErr>
where
Expand Down
4 changes: 2 additions & 2 deletions wheel/src/run_generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pub fn run_block_generator<'a>(
max_cost: Cost,
flags: u32,
signature: &Signature,
bls_cache: Option<&mut BlsCache>,
bls_cache: Option<&BlsCache>,
constants: &ConsensusConstants,
) -> (Option<u32>, Option<OwnedSpendBundleConditions>) {
let mut allocator = make_allocator(flags);
Expand Down Expand Up @@ -83,7 +83,7 @@ pub fn run_block_generator2<'a>(
max_cost: Cost,
flags: u32,
signature: &Signature,
bls_cache: Option<&mut BlsCache>,
bls_cache: Option<&BlsCache>,
constants: &ConsensusConstants,
) -> (Option<u32>, Option<OwnedSpendBundleConditions>) {
let mut allocator = make_allocator(flags);
Expand Down
Loading