Skip to content

Commit e070cee

Browse files
committed
chore: apply review comments
1 parent f328191 commit e070cee

File tree

5 files changed

+21
-31
lines changed

5 files changed

+21
-31
lines changed

mithril-client/src/aggregator_client.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -827,14 +827,12 @@ mod tests {
827827
when.matches(|req| {
828828
let headers = req.headers();
829829
let accept_encoding_header = headers
830-
.iter()
831-
.find(|(name, _values)| name.to_string().to_lowercase() == "accept-encoding")
830+
.get("accept-encoding")
832831
.expect("Accept-Encoding header not found");
833832

834-
let header_value = accept_encoding_header.1;
835-
["gzip", "br", "deflate", "zstd"]
836-
.iter()
837-
.all(|&value| header_value.to_str().unwrap().contains(value))
833+
["gzip", "br", "deflate", "zstd"].iter().all(|&encoding| {
834+
accept_encoding_header.to_str().is_ok_and(|h| h.contains(encoding))
835+
})
838836
});
839837

840838
then.status(200).body("ok");
@@ -855,14 +853,12 @@ mod tests {
855853
when.matches(|req| {
856854
let headers = req.headers();
857855
let accept_encoding_header = headers
858-
.iter()
859-
.find(|(name, _values)| name.to_string().to_lowercase() == "accept-encoding")
856+
.get("accept-encoding")
860857
.expect("Accept-Encoding header not found");
861858

862-
let header_value = accept_encoding_header.1;
863-
["gzip", "br", "deflate", "zstd"]
864-
.iter()
865-
.all(|&value| header_value.to_str().unwrap().contains(value))
859+
["gzip", "br", "deflate", "zstd"].iter().all(|&encoding| {
860+
accept_encoding_header.to_str().is_ok_and(|h| h.contains(encoding))
861+
})
866862
});
867863

868864
then.status(200).body("ok");

mithril-common/src/crypto_helper/codec/binary.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub trait TryFromBytes: Sized {
2121
/// Try to convert from hex string encoded bytes.
2222
fn try_from_bytes_hex(hex_string: &str) -> StdResult<Self> {
2323
let bytes = Vec::from_hex(hex_string)
24-
.map_err(|e| anyhow::anyhow!("Could not deserialize binary from hex string: {}", e))?;
24+
.map_err(|e| anyhow::anyhow!("Could not deserialize binary from hex string: {e}"))?;
2525

2626
Self::try_from_bytes(&bytes)
2727
}

mithril-relay/src/relay/aggregator.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,14 +253,12 @@ mod tests {
253253
when.is_true(|req| {
254254
let headers = req.headers();
255255
let accept_encoding_header = headers
256-
.iter()
257-
.find(|(name, _values)| name.to_string().to_lowercase() == "accept-encoding")
256+
.get("accept-encoding")
258257
.expect("Accept-Encoding header not found");
259258

260-
let header_value = accept_encoding_header.1;
261-
["gzip", "br", "deflate", "zstd"]
262-
.iter()
263-
.all(|&value| header_value.to_str().unwrap().contains(value))
259+
["gzip", "br", "deflate", "zstd"].iter().all(|&encoding| {
260+
accept_encoding_header.to_str().is_ok_and(|h| h.contains(encoding))
261+
})
264262
});
265263

266264
then.status(201).body("ok");

mithril-relay/src/relay/signer.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -555,14 +555,12 @@ mod tests {
555555
when.is_true(|req| {
556556
let headers = req.headers();
557557
let accept_encoding_header = headers
558-
.iter()
559-
.find(|(name, _values)| name.to_string().to_lowercase() == "accept-encoding")
558+
.get("accept-encoding")
560559
.expect("Accept-Encoding header not found");
561560

562-
let header_value = accept_encoding_header.1;
563-
["gzip", "br", "deflate", "zstd"]
564-
.iter()
565-
.all(|&value| header_value.to_str().unwrap().contains(value))
561+
["gzip", "br", "deflate", "zstd"].iter().all(|&encoding| {
562+
accept_encoding_header.to_str().is_ok_and(|h| h.contains(encoding))
563+
})
566564
});
567565

568566
then.status(200).body("ok");

mithril-signer/src/services/aggregator_client.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,14 +1025,12 @@ mod tests {
10251025
when.is_true(|req| {
10261026
let headers = req.headers();
10271027
let accept_encoding_header = headers
1028-
.iter()
1029-
.find(|(name, _values)| name.to_string().to_lowercase() == "accept-encoding")
1028+
.get("accept-encoding")
10301029
.expect("Accept-Encoding header not found");
10311030

1032-
let header_value = accept_encoding_header.1;
1033-
["gzip", "br", "deflate", "zstd"]
1034-
.iter()
1035-
.all(|&value| header_value.to_str().unwrap().contains(value))
1031+
["gzip", "br", "deflate", "zstd"].iter().all(|&encoding| {
1032+
accept_encoding_header.to_str().is_ok_and(|h| h.contains(encoding))
1033+
})
10361034
});
10371035

10381036
then.status(201);

0 commit comments

Comments
 (0)