Fix clippy on rustc beta toolchain (#4746)

* Fix clippy warnings for rust beta toolchain

* Cargo.lock nym-wallet
This commit is contained in:
Jon Häggblad
2024-08-05 17:59:49 +02:00
committed by GitHub
parent 996ce6a233
commit c92f09543e
5 changed files with 29 additions and 29 deletions
@@ -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()
),
@@ -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()
),
@@ -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(),
@@ -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,
),
@@ -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,
),
@@ -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()),
);
@@ -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,
),
@@ -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,
),
@@ -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,
),
@@ -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,
@@ -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,
),
@@ -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,
),
@@ -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(),
),
+6 -6
View File
@@ -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(),
@@ -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(),
),
@@ -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
),
@@ -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(),
@@ -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(),
@@ -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(),
+10 -10
View File
@@ -3094,9 +3094,9 @@ dependencies = [
"nym-ecash-time",
"nym-mixnet-contract-common",
"nym-node-requests",
"nym-serde-helpers",
"schemars",
"serde",
"serde-helpers",
"sha2 0.10.8",
"tendermint 0.37.0",
"thiserror",
@@ -3345,6 +3345,15 @@ dependencies = [
"pem",
]
[[package]]
name = "nym-serde-helpers"
version = "0.1.0"
dependencies = [
"base64 0.21.4",
"bs58 0.5.1",
"serde",
]
[[package]]
name = "nym-sphinx-types"
version = "0.2.0"
@@ -4789,15 +4798,6 @@ dependencies = [
"serde_derive",
]
[[package]]
name = "serde-helpers"
version = "0.1.0"
dependencies = [
"base64 0.21.4",
"bs58 0.5.1",
"serde",
]
[[package]]
name = "serde-json-wasm"
version = "0.5.0"