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

Return deletion provers when listing batch sizes #612

Merged
merged 1 commit into from
Sep 25, 2023
Merged

Return deletion provers when listing batch sizes #612

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions src/contracts/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@
.await?
.context("Missing tx")?;

use ethers::abi::AbiDecode;

Check warning on line 378 in src/contracts/mod.rs

View workflow job for this annotation

GitHub Actions / clippy

adding items after statements is confusing, since items exist from the start of the scope 

warning: adding items after statements is confusing, since items exist from the start of the scope
   --> src/contracts/mod.rs:378:9
    |
378 |         use ethers::abi::AbiDecode;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#items_after_statements
    = note: `#[warn(clippy::items_after_statements)]` implied by `#[warn(clippy::pedantic)]`

Check warning on line 378 in src/contracts/mod.rs

View workflow job for this annotation

GitHub Actions / clippy

adding items after statements is confusing, since items exist from the start of the scope 

warning: adding items after statements is confusing, since items exist from the start of the scope
   --> src/contracts/mod.rs:378:9
    |
378 |         use ethers::abi::AbiDecode;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#items_after_statements
    = note: `#[warn(clippy::items_after_statements)]` implied by `#[warn(clippy::pedantic)]`

Check warning on line 378 in src/contracts/mod.rs

View workflow job for this annotation

GitHub Actions / clippy

adding items after statements is confusing, since items exist from the start of the scope 

warning: adding items after statements is confusing, since items exist from the start of the scope
   --> src/contracts/mod.rs:378:9
    |
378 |         use ethers::abi::AbiDecode;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#items_after_statements
    = note: `#[warn(clippy::items_after_statements)]` implied by `#[warn(clippy::pedantic)]`
let delete_identities = DeleteIdentitiesCall::decode(&tx.input)?;

let packed_deletion_indices: &[u8] = delete_identities.packed_deletion_indices.as_ref();
Expand All @@ -383,7 +383,7 @@

tracing::error!("unpacked = {indices:?}");

let padding_index = 2u32.pow(self.tree_depth as u32);

Check warning on line 386 in src/contracts/mod.rs

View workflow job for this annotation

GitHub Actions / clippy

casting `usize` to `u32` may truncate the value on targets with 64-bit wide pointers 

warning: casting `usize` to `u32` may truncate the value on targets with 64-bit wide pointers
   --> src/contracts/mod.rs:386:38
    |
386 |         let padding_index = 2u32.pow(self.tree_depth as u32);
    |                                      ^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: if this is intentional allow the lint with `#[allow(clippy::cast_possible_truncation)]` ...
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#cast_possible_truncation
    = note: `#[warn(clippy::cast_possible_truncation)]` implied by `#[warn(clippy::pedantic)]`
help: ... or use `try_from` and handle the error accordingly
    |
386 |         let padding_index = 2u32.pow(u32::try_from(self.tree_depth));
    |                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Check warning on line 386 in src/contracts/mod.rs

View workflow job for this annotation

GitHub Actions / clippy

casting `usize` to `u32` may truncate the value on targets with 64-bit wide pointers 

warning: casting `usize` to `u32` may truncate the value on targets with 64-bit wide pointers
   --> src/contracts/mod.rs:386:38
    |
386 |         let padding_index = 2u32.pow(self.tree_depth as u32);
    |                                      ^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: if this is intentional allow the lint with `#[allow(clippy::cast_possible_truncation)]` ...
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#cast_possible_truncation
    = note: `#[warn(clippy::cast_possible_truncation)]` implied by `#[warn(clippy::pedantic)]`
help: ... or use `try_from` and handle the error accordingly
    |
386 |         let padding_index = 2u32.pow(u32::try_from(self.tree_depth));
    |                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Check warning on line 386 in src/contracts/mod.rs

View workflow job for this annotation

GitHub Actions / clippy

casting `usize` to `u32` may truncate the value on targets with 64-bit wide pointers 

warning: casting `usize` to `u32` may truncate the value on targets with 64-bit wide pointers
   --> src/contracts/mod.rs:386:38
    |
386 |         let padding_index = 2u32.pow(self.tree_depth as u32);
    |                                      ^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: if this is intentional allow the lint with `#[allow(clippy::cast_possible_truncation)]` ...
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#cast_possible_truncation
    = note: `#[warn(clippy::cast_possible_truncation)]` implied by `#[warn(clippy::pedantic)]`
help: ... or use `try_from` and handle the error accordingly
    |
386 |         let padding_index = 2u32.pow(u32::try_from(self.tree_depth));
    |                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Ok(indices
.into_iter()
Expand Down Expand Up @@ -485,11 +485,15 @@
}

pub async fn list_batch_sizes(&self) -> Result<Vec<ProverConfiguration>, ServerError> {
Ok(self
let mut provers = self
.insertion_prover_map
.read()
.await
.as_configuration_vec())
.as_configuration_vec();

provers.extend(self.deletion_prover_map.read().await.as_configuration_vec());

Ok(provers)
}

pub async fn has_insertion_provers(&self) -> bool {
Expand Down
Loading