Skip to content

Fix clippy on rustc beta toolchain #4746

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
octol merged 2 commits into from
Aug 5, 2024
Merged

Fix clippy on rustc beta toolchain #4746

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
d23c6a1
Fix clippy warnings for rust beta toolchain
octol Aug 5, 2024
e7920de
Cargo.lock nym-wallet
octol Aug 5, 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
6 changes: 3 additions & 3 deletions common/nym_offline_compact_ecash/benches/benchmarks_coin_indices_signatures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fn bench_coin_signing(c: &mut Criterion) {

// ISSUING AUTHORITY BENCHMARK: issue a set of (partial) signatures for coin indices
group.bench_function(
&format!(
format!(
"[IssuingAuthority] sign_coin_indices_L_{}",
params.get_total_coins()
),
Expand All @@ -47,7 +47,7 @@ fn bench_coin_signing(c: &mut Criterion) {
verify_coin_indices_signatures(&verification_key, &vk_i_auth, &partial_signatures).is_ok()
);
group.bench_function(
&format!(
format!(
"[Client] verify_coin_indices_signatures_L_{}",
params.get_total_coins()
),
Expand Down Expand Up @@ -99,7 +99,7 @@ fn bench_aggregate_coin_indices_signatures(c: &mut Criterion) {

// CLIENT: verify all the partial signature vectors and aggregate into a single vector of signed coin indices
group.bench_function(
&format!(
format!(
"[Client] aggregate_coin_indices_signatures_from_{}_issuing_authorities_L_{}",
authorities_keypairs.len(),
params.get_total_coins(),
Expand Down
14 changes: 7 additions & 7 deletions common/nym_offline_compact_ecash/benches/benchmarks_ecash_e2e.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ fn bench_compact_ecash(c: &mut Criterion) {

// CLIENT BENCHMARK: prepare a single withdrawal request
group.bench_function(
&format!(
format!(
"[Client] withdrawal_request_{}_authorities_{}_L_{}_threshold",
case.num_authorities, case.ll, case.threshold_p,
),
Expand All @@ -114,7 +114,7 @@ fn bench_compact_ecash(c: &mut Criterion) {
let mut rng = rand::thread_rng();
let keypair = authorities_keypairs.choose(&mut rng).unwrap();
group.bench_function(
&format!(
format!(
"[Issuing Authority] issue_partial_wallet_with_L_{}",
case.ll,
),
Expand Down Expand Up @@ -147,7 +147,7 @@ fn bench_compact_ecash(c: &mut Criterion) {
let w = wallet_blinded_signatures.first().unwrap();
let vk = verification_keys_auth.first().unwrap();
group.bench_function(
&format!("[Client] issue_verify_a_partial_wallet_with_L_{}", case.ll,),
format!("[Client] issue_verify_a_partial_wallet_with_L_{}", case.ll,),
|b| b.iter(|| issue_verify(vk, user_keypair.secret_key(), w, &req_info, 1).unwrap()),
);

Expand All @@ -163,7 +163,7 @@ fn bench_compact_ecash(c: &mut Criterion) {

// CLIENT BENCHMARK: aggregating all partial wallets
group.bench_function(
&format!(
format!(
"[Client] aggregate_wallets_with_L_{}_threshold_{}",
case.ll, case.threshold_p,
),
Expand Down Expand Up @@ -196,7 +196,7 @@ fn bench_compact_ecash(c: &mut Criterion) {
};
// CLIENT BENCHMARK: spend a single coin from the wallet
group.bench_function(
&format!(
format!(
"[Client] spend_a_single_coin_L_{}_threshold_{}",
case.ll, case.threshold_p,
),
Expand Down Expand Up @@ -233,7 +233,7 @@ fn bench_compact_ecash(c: &mut Criterion) {

// MERCHANT BENCHMARK: verify whether the submitted payment is legit
group.bench_function(
&format!(
format!(
"[Merchant] spend_verify_of_a_single_payment_L_{}_threshold_{}",
case.ll, case.threshold_p,
),
Expand Down Expand Up @@ -280,7 +280,7 @@ fn bench_compact_ecash(c: &mut Criterion) {

// MERCHANT BENCHMARK: identify double spending
group.bench_function(
&format!(
format!(
"[Merchant] identify_L_{}_threshold_{}_spend_vv_{}_pks_{}",
case.ll,
case.threshold_p,
Expand Down
6 changes: 3 additions & 3 deletions common/nym_offline_compact_ecash/benches/benchmarks_expiration_date_signatures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ fn bench_partial_sign_expiration_date(c: &mut Criterion) {

// ISSUING AUTHORITY BENCHMARK: issue a set of (partial) signatures for a given expiration date
group.bench_function(
&format!(
format!(
"[IssuingAuthority] sign_expiration_date_{}_validity_period",
constants::CRED_VALIDITY_PERIOD_DAYS,
),
Expand All @@ -31,7 +31,7 @@ fn bench_partial_sign_expiration_date(c: &mut Criterion) {
// CLIENT: verify the correctness of the set of (partial) signatures for a given expiration date
assert!(verify_valid_dates_signatures(&vk_i_auth, &partial_exp_sig, expiration_date).is_ok());
group.bench_function(
&format!(
format!(
"[Client] verify_valid_dates_signatures_{}_validity_period",
constants::CRED_VALIDITY_PERIOD_DAYS,
),
Expand Down Expand Up @@ -78,7 +78,7 @@ fn bench_aggregate_expiration_date_signatures(c: &mut Criterion) {

// CLIENT: verify all the partial signature vectors and aggregate into a single vector of signed valid dates
group.bench_function(
&format!(
format!(
"[Client] aggregate_expiration_signatures_from_{}_issuing_authorities_{}_validity_period",
constants::CRED_VALIDITY_PERIOD_DAYS, authorities_keypairs.len(),
),
Expand Down
12 changes: 6 additions & 6 deletions common/nymcoconut/benches/benchmarks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ fn bench_coconut(c: &mut Criterion) {
// Let's benchmark the operations the client has to perform
// to ask for a credential
group.bench_function(
&format!(
format!(
"[Client] prepare_blind_sign_{}_authorities_{}_attributes_{}_threshold",
case.num_authorities,
case.num_attrs(),
Expand All @@ -205,7 +205,7 @@ fn bench_coconut(c: &mut Criterion) {
let keypair = coconut_keypairs.choose(&mut rng).unwrap();

group.bench_function(
&format!(
format!(
"[Validator] compute_single_blind_sign_for_credential_with_{}_attributes",
case.num_attrs(),
),
Expand Down Expand Up @@ -247,7 +247,7 @@ fn bench_coconut(c: &mut Criterion) {
let partial_verification_key = verification_keys.get(rand_idx).unwrap();

group.bench_function(
&format!(
format!(
"verify_partial_blind_signature_{}_private_attributes_{}_public_attributes",
case.num_private_attrs, case.num_public_attrs
),
Expand Down Expand Up @@ -284,7 +284,7 @@ fn bench_coconut(c: &mut Criterion) {

// CLIENT BENCHMARK: aggregate all partial credentials
group.bench_function(
&format!(
format!(
"[Client] unblind_and_aggregate_partial_credentials_{}_authorities_{}_attributes_{}_threshold",
case.num_authorities,
case.num_attrs(),
Expand Down Expand Up @@ -317,7 +317,7 @@ fn bench_coconut(c: &mut Criterion) {

// CLIENT BENCHMARK
group.bench_function(
&format!(
format!(
"[Client] randomize_and_prove_credential_{}_authorities_{}_attributes_{}_threshold",
case.num_authorities,
case.num_attrs(),
Expand All @@ -343,7 +343,7 @@ fn bench_coconut(c: &mut Criterion) {

// VERIFICATION BENCHMARK
group.bench_function(
&format!(
format!(
"[Verifier] verify_credentials_{}_authorities_{}_attributes_{}_threshold",
case.num_authorities,
case.num_attrs(),
Expand Down
20 changes: 10 additions & 10 deletions nym-wallet/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.