Skip to content

Commit 800c579

Browse files
Mr-LeshiyMr-Leshiy
committed
fix clippy
1 parent 12d8778 commit 800c579

File tree

9 files changed

+29
-26
lines changed

9 files changed

+29
-26
lines changed

‎rust/c509-certificate/examples/cli/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ fn time_to_string(time: u64) -> anyhow::Result<String> {
364364
// Attempt to convert the timestamp and handle errors if they occur
365365
let timestamp: i64 = time
366366
.try_into()
367-
.map_err(|e| anyhow::anyhow!("Failed to convert time: {:?}", e))?;
367+
.map_err(|e| anyhow::anyhow!("Failed to convert time: {e:?}"))?;
368368

369369
// Convert the timestamp to a DateTime and handle any potential errors
370370
let datetime = DateTime::from_timestamp(timestamp, 0)

‎rust/cardano-blockchain-types/src/auxdata/scripts.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ impl TryFrom<u64> for ScriptType {
100100

101101
fn try_from(value: u64) -> Result<Self, Self::Error> {
102102
match value {
103-
0 => Err(anyhow!("Invalid script type: {}", value)),
103+
0 => Err(anyhow!("Invalid script type: {value}")),
104104
1 => Ok(Self::Native),
105105
_ => Ok(Self::Plutus(value.saturating_sub(1))),
106106
}

‎rust/immutable-ledger/src/serialize.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ impl BlockHeader {
437437
let prev_block_hash_type = match hash_function.as_u64() {
438438
BLAKE3_CBOR_TAG => HashFunction::Blake3,
439439
BLAKE_2B_CBOR_TAG => HashFunction::Blake2b,
440-
_ => bail!(format!("Invalid hash function type {:?}", hash_function)),
440+
_ => bail!(format!("Invalid hash function type {hash_function:?}")),
441441
};
442442

443443
let prev_block_hash = cbor_decoder

‎rust/signed_doc/tests/common/proposal.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ pub fn proposal_doc(
1212
) -> anyhow::Result<CatalystSignedDocument> {
1313
let id = UuidV7::new();
1414
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer)
15-
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
16-
Ok(Builder::new()
15+
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
16+
Builder::new()
1717
.with_json_metadata(serde_json::json!({
1818
"content-type": ContentType::Json.to_string(),
1919
"content-encoding": ContentEncoding::Brotli.to_string(),
@@ -31,5 +31,5 @@ pub fn proposal_doc(
3131
}))?
3232
.with_json_content(&serde_json::json!({}))?
3333
.add_signature(|m| sk.sign(&m).to_vec(), kid)?
34-
.build()?)
34+
.build()
3535
}

‎rust/signed_doc/tests/common/proposal_comment.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub fn proposal_comment_doc(
1212
) -> anyhow::Result<CatalystSignedDocument> {
1313
let id = UuidV7::new();
1414
let (sk, _, kid) = create_dummy_key_pair(RoleId::Role0)
15-
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
15+
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
1616
Builder::new()
1717
.with_json_metadata(serde_json::json!({
1818
"content-type": ContentType::Json.to_string(),

‎rust/signed_doc/tests/common/proposal_submission_action.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub fn proposal_submission_action_doc(
1010
) -> anyhow::Result<CatalystSignedDocument> {
1111
let id = UuidV7::new();
1212
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer)
13-
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
13+
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
1414
Builder::new()
1515
.with_json_metadata(serde_json::json!({
1616
"content-type": ContentType::Json.to_string(),

‎rust/signed_doc/tests/proposal.rs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ mod common;
4949
let parameters = brand_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
5050
let template = proposal_form_template_doc(&parameters).inspect(|v| provider.add_document(None, v).unwrap())?;
5151
let id = UuidV7::new();
52-
let (sk, _, kid) = create_dummy_key_pair(RoleId::Role0).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
52+
let (sk, _, kid) = create_dummy_key_pair(RoleId::Role0).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
5353
Builder::new()
5454
.with_json_metadata(serde_json::json!({
5555
"content-type": ContentType::Json.to_string(),
@@ -79,7 +79,7 @@ mod common;
7979
let parameters = brand_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
8080
let template = proposal_form_template_doc(&parameters).inspect(|v| provider.add_document(None, v).unwrap())?;
8181
let id = UuidV7::new();
82-
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
82+
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
8383
Builder::new()
8484
.with_json_metadata(serde_json::json!({
8585
"content-type": ContentType::Json.to_string(),
@@ -109,7 +109,7 @@ mod common;
109109
let parameters = brand_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
110110
let template = proposal_form_template_doc(&parameters).inspect(|v| provider.add_document(None, v).unwrap())?;
111111
let id = UuidV7::new();
112-
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
112+
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
113113
Builder::new()
114114
.with_json_metadata(serde_json::json!({
115115
"content-type": ContentType::Json.to_string(),
@@ -137,7 +137,7 @@ mod common;
137137
|provider| {
138138
let parameters = brand_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
139139
let id = UuidV7::new();
140-
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
140+
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
141141
Builder::new()
142142
.with_json_metadata(serde_json::json!({
143143
"content-type": ContentType::Json.to_string(),
@@ -163,7 +163,7 @@ mod common;
163163
let parameters = brand_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
164164
let template = proposal_form_template_doc(&parameters).inspect(|v| provider.add_document(None, v).unwrap())?;
165165
let id = UuidV7::new();
166-
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
166+
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
167167
Builder::new()
168168
.with_json_metadata(serde_json::json!({
169169
"content-type": ContentType::Json.to_string(),
@@ -185,6 +185,7 @@ mod common;
185185
"missing parameters"
186186
)]
187187
#[tokio::test]
188+
#[allow(clippy::unwrap_used)]
188189
async fn test_proposal_doc(
189190
doc_gen: impl FnOnce(&mut TestCatalystProvider) -> anyhow::Result<CatalystSignedDocument>
190191
) -> bool {

‎rust/signed_doc/tests/proposal_comment.rs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ mod common;
6060
let comment = proposal_comment_doc(&proposal, &template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
6161
let id = UuidV7::new();
6262
let (sk, _, kid) = create_dummy_key_pair(RoleId::Role0)
63-
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
63+
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
6464
Builder::new()
6565
.with_json_metadata(serde_json::json!({
6666
"content-type": ContentType::Json.to_string(),
@@ -101,7 +101,7 @@ mod common;
101101
let template = proposal_comment_form_template_doc(&parameters).inspect(|v| provider.add_document(None, v).unwrap())?;
102102
let id = UuidV7::new();
103103
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer)
104-
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
104+
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
105105
Builder::new()
106106
.with_json_metadata(serde_json::json!({
107107
"content-type": ContentType::Json.to_string(),
@@ -138,7 +138,7 @@ mod common;
138138
let template = proposal_comment_form_template_doc(&parameters).inspect(|v| provider.add_document(None, v).unwrap())?;
139139
let id = UuidV7::new();
140140
let (sk, _, kid) = create_dummy_key_pair(RoleId::Role0)
141-
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
141+
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
142142
let doc = Builder::new()
143143
.with_json_metadata(serde_json::json!({
144144
"content-type": ContentType::Json.to_string(),
@@ -176,7 +176,7 @@ mod common;
176176
let template = proposal_comment_form_template_doc(&parameters).inspect(|v| provider.add_document(None, v).unwrap())?;
177177
let id = UuidV7::new();
178178
let (sk, _, kid) = create_dummy_key_pair(RoleId::Role0)
179-
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
179+
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
180180
let doc = Builder::new()
181181
.with_json_metadata(serde_json::json!({
182182
"content-type": ContentType::Json.to_string(),
@@ -212,7 +212,7 @@ mod common;
212212
let proposal = proposal_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
213213
let id = UuidV7::new();
214214
let (sk, _, kid) = create_dummy_key_pair(RoleId::Role0)
215-
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
215+
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
216216
let doc = Builder::new()
217217
.with_json_metadata(serde_json::json!({
218218
"content-type": ContentType::Json.to_string(),
@@ -246,7 +246,7 @@ mod common;
246246
let template = proposal_comment_form_template_doc(&parameters).inspect(|v| provider.add_document(None, v).unwrap())?;
247247
let id = UuidV7::new();
248248
let (sk, _, kid) = create_dummy_key_pair(RoleId::Role0)
249-
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
249+
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
250250
let doc = Builder::new()
251251
.with_json_metadata(serde_json::json!({
252252
"content-type": ContentType::Json.to_string(),
@@ -278,7 +278,7 @@ mod common;
278278
let template = proposal_comment_form_template_doc(&parameters).inspect(|v| provider.add_document(None, v).unwrap())?;
279279
let id = UuidV7::new();
280280
let (sk, _, kid) = create_dummy_key_pair(RoleId::Role0)
281-
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
281+
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
282282
let doc = Builder::new()
283283
.with_json_metadata(serde_json::json!({
284284
"content-type": ContentType::Json.to_string(),
@@ -305,6 +305,7 @@ mod common;
305305
"missing ref"
306306
)]
307307
#[tokio::test]
308+
#[allow(clippy::unwrap_used)]
308309
async fn test_proposal_comment_doc(
309310
doc_gen: impl FnOnce(&mut TestCatalystProvider) -> anyhow::Result<CatalystSignedDocument>
310311
) -> bool {

‎rust/signed_doc/tests/proposal_submission_action.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ mod common;
5353
let template = proposal_form_template_doc(&parameters).inspect(|v| provider.add_document(None, v).unwrap())?;
5454
let proposal = proposal_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
5555
let id = UuidV7::new();
56-
let (sk, _, kid) = create_dummy_key_pair(RoleId::Role0).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
56+
let (sk, _, kid) = create_dummy_key_pair(RoleId::Role0).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
5757
Builder::new()
5858
.with_json_metadata(serde_json::json!({
5959
"content-type": ContentType::Json.to_string(),
@@ -86,7 +86,7 @@ mod common;
8686
let template = proposal_form_template_doc(&parameters).inspect(|v| provider.add_document(None, v).unwrap())?;
8787
let proposal = proposal_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
8888
let id = UuidV7::new();
89-
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
89+
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
9090
let doc = Builder::new()
9191
.with_json_metadata(serde_json::json!({
9292
"content-type": ContentType::Json.to_string(),
@@ -118,7 +118,7 @@ mod common;
118118
let template = proposal_form_template_doc(&parameters).inspect(|v| provider.add_document(None, v).unwrap())?;
119119
let proposal = proposal_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
120120
let id = UuidV7::new();
121-
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
121+
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
122122
let doc = Builder::new()
123123
.with_json_metadata(serde_json::json!({
124124
"content-type": ContentType::Json.to_string(),
@@ -150,7 +150,7 @@ mod common;
150150
let template = proposal_form_template_doc(&parameters).inspect(|v| provider.add_document(None, v).unwrap())?;
151151
let proposal = proposal_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
152152
let id = UuidV7::new();
153-
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
153+
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
154154
let doc = Builder::new()
155155
.with_json_metadata(serde_json::json!({
156156
"content-type": ContentType::Json.to_string(),
@@ -181,7 +181,7 @@ mod common;
181181
|provider| {
182182
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
183183
let id = UuidV7::new();
184-
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
184+
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
185185
let doc = Builder::new()
186186
.with_json_metadata(serde_json::json!({
187187
"content-type": ContentType::Json.to_string(),
@@ -211,7 +211,7 @@ mod common;
211211
let template = proposal_form_template_doc(&parameters).inspect(|v| provider.add_document(None, v).unwrap())?;
212212
let proposal = proposal_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
213213
let id = UuidV7::new();
214-
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
214+
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
215215
let doc = Builder::new()
216216
.with_json_metadata(serde_json::json!({
217217
"content-type": ContentType::Json.to_string(),
@@ -236,6 +236,7 @@ mod common;
236236
"missing parameters"
237237
)]
238238
#[tokio::test]
239+
#[allow(clippy::unwrap_used)]
239240
async fn test_proposal_submission_action_doc(
240241
doc_gen: impl FnOnce(&mut TestCatalystProvider) -> anyhow::Result<CatalystSignedDocument>
241242
) -> bool {

0 commit comments

Comments
 (0)