Skip to content

Commit 8fc8af2

Browse files
jpraynaudjpraynaud
authored
Merge pull request #657 from input-output-hk/jpraynaud/fix-clippy-warnings-2022-12-15
Fix clippy warnings from Rust `1.66.0`
2 parents 715f04d + 251ea80 commit 8fc8af2

File tree

15 files changed

+33
-34
lines changed

15 files changed

+33
-34
lines changed

‎mithril-aggregator/src/certificate_creator.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ impl CertificateCreator for MithrilCertificateCreator {
5151
signers,
5252
);
5353
let multi_signature =
54-
key_encode_hex(&multi_signature).map_err(CertificateCreationError::Codec)?;
54+
key_encode_hex(multi_signature).map_err(CertificateCreationError::Codec)?;
5555
let genesis_signature = "".to_string();
5656

5757
Ok(entities::Certificate::new(

‎mithril-aggregator/src/http_server/routes/certificate_routes.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ use warp::Filter;
55

66
pub fn routes(
77
dependency_manager: Arc<DependencyManager>,
8-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
8+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
99
certificate_pending(dependency_manager.clone())
1010
.or(certificate_certificate_hash(dependency_manager))
1111
}
1212

1313
/// GET /certificate-pending
1414
fn certificate_pending(
1515
dependency_manager: Arc<DependencyManager>,
16-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
16+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
1717
warp::path!("certificate-pending")
1818
.and(warp::get())
1919
.and(middlewares::with_certificate_pending_store(
@@ -25,7 +25,7 @@ fn certificate_pending(
2525
/// GET /certificate/{certificate_hash}
2626
fn certificate_certificate_hash(
2727
dependency_manager: Arc<DependencyManager>,
28-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
28+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
2929
warp::path!("certificate" / String)
3030
.and(warp::get())
3131
.and(middlewares::with_certificate_store(dependency_manager))
@@ -95,7 +95,7 @@ mod tests {
9595

9696
fn setup_router(
9797
dependency_manager: Arc<DependencyManager>,
98-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
98+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
9999
let cors = warp::cors()
100100
.allow_any_origin()
101101
.allow_headers(vec!["content-type"])

‎mithril-aggregator/src/http_server/routes/epoch_routes.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ use warp::Filter;
55

66
pub fn routes(
77
dependency_manager: Arc<DependencyManager>,
8-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
8+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
99
epoch_settings(dependency_manager)
1010
}
1111

1212
/// GET /epoch-settings
1313
fn epoch_settings(
1414
dependency_manager: Arc<DependencyManager>,
15-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
15+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
1616
warp::path!("epoch-settings")
1717
.and(warp::get())
1818
.and(middlewares::with_protocol_parameters_store(
@@ -94,7 +94,7 @@ mod tests {
9494

9595
fn setup_router(
9696
dependency_manager: Arc<DependencyManager>,
97-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
97+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
9898
let cors = warp::cors()
9999
.allow_any_origin()
100100
.allow_headers(vec!["content-type"])

‎mithril-aggregator/src/http_server/routes/router.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use warp::Filter;
1414
/// Routes
1515
pub fn routes(
1616
dependency_manager: Arc<DependencyManager>,
17-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
17+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
1818
let cors = warp::cors()
1919
.allow_any_origin()
2020
.allow_headers(vec!["content-type"])

‎mithril-aggregator/src/http_server/routes/signatures_routes.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ use warp::Filter;
55

66
pub fn routes(
77
dependency_manager: Arc<DependencyManager>,
8-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
8+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
99
register_signatures(dependency_manager)
1010
}
1111

1212
/// POST /register-signatures
1313
fn register_signatures(
1414
dependency_manager: Arc<DependencyManager>,
15-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
15+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
1616
warp::path!("register-signatures")
1717
.and(warp::post())
1818
.and(warp::body::json())
@@ -68,7 +68,7 @@ mod tests {
6868

6969
fn setup_router(
7070
dependency_manager: Arc<DependencyManager>,
71-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
71+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
7272
let cors = warp::cors()
7373
.allow_any_origin()
7474
.allow_headers(vec!["content-type"])

‎mithril-aggregator/src/http_server/routes/signer_routes.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ use warp::Filter;
55

66
pub fn routes(
77
dependency_manager: Arc<DependencyManager>,
8-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
8+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
99
register_signer(dependency_manager)
1010
}
1111

1212
/// POST /register-signer
1313
fn register_signer(
1414
dependency_manager: Arc<DependencyManager>,
15-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
15+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
1616
warp::path!("register-signer")
1717
.and(warp::post())
1818
.and(warp::body::json())
@@ -80,7 +80,7 @@ mod tests {
8080

8181
fn setup_router(
8282
dependency_manager: Arc<DependencyManager>,
83-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
83+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
8484
let cors = warp::cors()
8585
.allow_any_origin()
8686
.allow_headers(vec!["content-type"])

‎mithril-aggregator/src/http_server/routes/snapshot_routes.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use warp::Filter;
55

66
pub fn routes(
77
dependency_manager: Arc<DependencyManager>,
8-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
8+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
99
snapshots(dependency_manager.clone())
1010
.or(serve_snapshots_dir(dependency_manager.clone()))
1111
.or(snapshot_download(dependency_manager.clone()))
@@ -15,7 +15,7 @@ pub fn routes(
1515
/// GET /snapshots
1616
fn snapshots(
1717
dependency_manager: Arc<DependencyManager>,
18-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
18+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
1919
warp::path!("snapshots")
2020
.and(warp::get())
2121
.and(middlewares::with_snapshot_store(dependency_manager))
@@ -25,7 +25,7 @@ fn snapshots(
2525
/// GET /snapshots/{digest}/download
2626
fn snapshot_download(
2727
dependency_manager: Arc<DependencyManager>,
28-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
28+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
2929
warp::path!("snapshot" / String / "download")
3030
.and(warp::get())
3131
.and(middlewares::with_config(dependency_manager.clone()))
@@ -35,7 +35,7 @@ fn snapshot_download(
3535

3636
fn serve_snapshots_dir(
3737
dependency_manager: Arc<DependencyManager>,
38-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
38+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
3939
let config = dependency_manager.config.clone();
4040

4141
warp::path("snapshot_download")
@@ -47,7 +47,7 @@ fn serve_snapshots_dir(
4747
/// GET /snapshot/digest
4848
fn snapshot_digest(
4949
dependency_manager: Arc<DependencyManager>,
50-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
50+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
5151
warp::path!("snapshot" / String)
5252
.and(warp::get())
5353
.and(middlewares::with_snapshot_store(dependency_manager))
@@ -182,7 +182,7 @@ mod tests {
182182

183183
fn setup_router(
184184
dependency_manager: Arc<DependencyManager>,
185-
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
185+
) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
186186
let cors = warp::cors()
187187
.allow_any_origin()
188188
.allow_headers(vec!["content-type"])

‎mithril-aggregator/src/multi_signer.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ impl MultiSigner for MultiSignerImpl {
564564
signer.verification_key_signature.to_owned(),
565565
signer.operational_certificate.to_owned(),
566566
signer.kes_period.to_owned(),
567-
*stake as u64,
567+
*stake,
568568
)
569569
})
570570
})
@@ -598,7 +598,7 @@ impl MultiSigner for MultiSignerImpl {
598598
signer.verification_key_signature.to_owned(),
599599
signer.operational_certificate.to_owned(),
600600
signer.kes_period.to_owned(),
601-
*stake as u64,
601+
*stake,
602602
)
603603
})
604604
})
@@ -851,7 +851,7 @@ mod tests {
851851

852852
offset_epoch(
853853
&mut multi_signer,
854-
(SIGNER_EPOCH_RECORDING_OFFSET - SIGNER_EPOCH_RETRIEVAL_OFFSET) as i64,
854+
SIGNER_EPOCH_RECORDING_OFFSET - SIGNER_EPOCH_RETRIEVAL_OFFSET,
855855
)
856856
.await;
857857

@@ -887,7 +887,7 @@ mod tests {
887887

888888
offset_epoch(
889889
&mut multi_signer,
890-
(SIGNER_EPOCH_RECORDING_OFFSET - SIGNER_EPOCH_RETRIEVAL_OFFSET) as i64,
890+
SIGNER_EPOCH_RECORDING_OFFSET - SIGNER_EPOCH_RETRIEVAL_OFFSET,
891891
)
892892
.await;
893893

@@ -952,7 +952,7 @@ mod tests {
952952

953953
offset_epoch(
954954
&mut multi_signer,
955-
(SIGNER_EPOCH_RECORDING_OFFSET - SIGNER_EPOCH_RETRIEVAL_OFFSET) as i64,
955+
SIGNER_EPOCH_RECORDING_OFFSET - SIGNER_EPOCH_RETRIEVAL_OFFSET,
956956
)
957957
.await;
958958
// We have to update the current message AFTER we reached the epoch for

‎mithril-aggregator/src/runtime/runner.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,7 @@ impl AggregatorRunnerTrait for AggregatorRunner {
549549
.get_single_signatures(&working_certificate.beacon)
550550
.await?
551551
.unwrap_or_default()
552-
.into_iter()
553-
.map(|(party_id, _single_signature)| party_id)
552+
.into_keys()
554553
.collect::<Vec<_>>();
555554
let multi_signature = multisigner.get_multi_signature().await?.ok_or_else(|| {
556555
RuntimeError::General("no multi signature generated".to_string().into())

‎mithril-client/src/aggregator.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ mod tests {
443443
let location = server.url(url_path);
444444
let local_file_path = aggregator_client.download_snapshot(digest, &location).await;
445445
local_file_path.as_ref().expect("unexpected error");
446-
let data_downloaded = fs::read_to_string(&local_file_path.unwrap()).unwrap();
446+
let data_downloaded = fs::read_to_string(local_file_path.unwrap()).unwrap();
447447

448448
assert_eq!(data_downloaded, data_expected);
449449
}

0 commit comments

Comments
 (0)