Skip to content

Commit e15670f

Browse files
saibatizokusaibatizoku
committed
chore(rust/signed-doc): fmt fix
1 parent 46cd580 commit e15670f

File tree

12 files changed

+105
-62
lines changed

12 files changed

+105
-62
lines changed

‎rust/signed_doc/src/cid_v1.rs‎

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,9 @@
3232
//! # Ok::<(), anyhow::Error>(())
3333
//! ```
3434
35-
use std::fmt;
36-
use std::ops::Deref;
37-
use std::str::FromStr;
35+
use std::{fmt, ops::Deref, str::FromStr};
3836

39-
use minicbor::data::Tag;
40-
use minicbor::decode::Error as DecodeError;
41-
use minicbor::{Decoder, Encoder};
37+
use minicbor::{Decoder, Encoder, data::Tag, decode::Error as DecodeError};
4238
use sha2::{Digest, Sha256};
4339
use thiserror::Error;
4440

@@ -78,7 +74,8 @@ pub enum CidError {
7874
/// A newtype wrapper around `cid::Cid` for type-safe CID v1 handling.
7975
///
8076
/// This type provides conversion methods and trait implementations for working with
81-
/// CID v1 identifiers, especially in the context of CBOR-encoded Catalyst Signed Documents.
77+
/// CID v1 identifiers, especially in the context of CBOR-encoded Catalyst Signed
78+
/// Documents.
8279
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
8380
pub struct Cid(cid::Cid);
8481

@@ -129,13 +126,19 @@ impl FromStr for Cid {
129126
}
130127

131128
impl fmt::Display for Cid {
132-
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
129+
fn fmt(
130+
&self,
131+
f: &mut fmt::Formatter<'_>,
132+
) -> fmt::Result {
133133
write!(f, "{}", self.0)
134134
}
135135
}
136136

137137
impl serde::Serialize for Cid {
138-
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
138+
fn serialize<S>(
139+
&self,
140+
serializer: S,
141+
) -> Result<S::Ok, S::Error>
139142
where
140143
S: serde::Serializer,
141144
{
@@ -145,9 +148,7 @@ impl serde::Serialize for Cid {
145148

146149
impl<'de> serde::Deserialize<'de> for Cid {
147150
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
148-
where
149-
D: serde::Deserializer<'de>,
150-
{
151+
where D: serde::Deserializer<'de> {
151152
let s = String::deserialize(deserializer)?;
152153
FromStr::from_str(&s).map_err(serde::de::Error::custom)
153154
}
@@ -167,8 +168,14 @@ impl minicbor::Encode<()> for Cid {
167168
}
168169

169170
impl<'de> minicbor::Decode<'de, ()> for Cid {
170-
fn decode(d: &mut Decoder<'de>, _ctx: &mut ()) -> Result<Self, DecodeError> {
171-
let tag = d.tag().map_err(|e| DecodeError::message(e.to_string()))?.as_u64();
171+
fn decode(
172+
d: &mut Decoder<'de>,
173+
_ctx: &mut (),
174+
) -> Result<Self, DecodeError> {
175+
let tag = d
176+
.tag()
177+
.map_err(|e| DecodeError::message(e.to_string()))?
178+
.as_u64();
172179
if tag != CID_CBOR_TAG {
173180
return Err(DecodeError::message(format!(
174181
"Expected IPLD CID tag ({CID_CBOR_TAG}), got {tag}",
@@ -259,8 +266,8 @@ mod tests {
259266
let cid_bytes = Vec::<u8>::from(cid);
260267

261268
// Convert back from bytes
262-
let cid_from_bytes = Cid::try_from(cid_bytes.as_slice())
263-
.expect("Should parse CID from bytes");
269+
let cid_from_bytes =
270+
Cid::try_from(cid_bytes.as_slice()).expect("Should parse CID from bytes");
264271

265272
assert_eq!(cid, cid_from_bytes);
266273
}
@@ -274,8 +281,7 @@ mod tests {
274281
let cid_string = cid.to_string();
275282

276283
// Parse the string back to a CID
277-
let cid_from_str = Cid::from_str(&cid_string)
278-
.expect("CID string should be parseable");
284+
let cid_from_str = Cid::from_str(&cid_string).expect("CID string should be parseable");
279285

280286
assert_eq!(cid, cid_from_str);
281287
}
@@ -289,8 +295,10 @@ mod tests {
289295
let cid_string = cid.to_string();
290296

291297
// Should be multibase encoded (starts with 'b' for base32)
292-
assert!(cid_string.starts_with('b'),
293-
"CID v1 base32 string should start with 'b'");
298+
assert!(
299+
cid_string.starts_with('b'),
300+
"CID v1 base32 string should start with 'b'"
301+
);
294302
}
295303

296304
#[test]
@@ -407,10 +415,10 @@ mod tests {
407415
.build()
408416
.expect("Should build document");
409417

410-
let cid1 = to_cid_v1(&doc1.to_bytes().expect("Should serialize"))
411-
.expect("CID 1 should be valid");
412-
let cid2 = to_cid_v1(&doc2.to_bytes().expect("Should serialize"))
413-
.expect("CID 2 should be valid");
418+
let cid1 =
419+
to_cid_v1(&doc1.to_bytes().expect("Should serialize")).expect("CID 1 should be valid");
420+
let cid2 =
421+
to_cid_v1(&doc2.to_bytes().expect("Should serialize")).expect("CID 2 should be valid");
414422

415423
assert_ne!(
416424
cid1, cid2,
@@ -434,7 +442,10 @@ mod tests {
434442

435443
// Base32 encoding uses lowercase letters and digits 2-7
436444
assert!(
437-
cid_string.chars().skip(1).all(|c| c.is_ascii_lowercase() || ('2'..='7').contains(&c)),
445+
cid_string
446+
.chars()
447+
.skip(1)
448+
.all(|c| c.is_ascii_lowercase() || ('2'..='7').contains(&c)),
438449
"CID v1 base32 string should only contain lowercase letters and digits 2-7"
439450
);
440451

@@ -458,8 +469,8 @@ mod tests {
458469
let cid_bytes = Vec::<u8>::from(cid);
459470

460471
// Parse bytes back to CID
461-
let cid_from_bytes = Cid::try_from(cid_bytes.as_slice())
462-
.expect("Should parse CID from bytes");
472+
let cid_from_bytes =
473+
Cid::try_from(cid_bytes.as_slice()).expect("Should parse CID from bytes");
463474

464475
// Convert back to string
465476
let final_string = cid_from_bytes.to_string();

‎rust/signed_doc/src/lib.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,8 @@ impl CatalystSignedDocument {
265265
/// - CBOR serialization failure
266266
/// - Multihash construction failure
267267
pub fn to_cid_v1(&self) -> Result<cid_v1::Cid, cid_v1::CidError> {
268-
let cbor_bytes = self.to_bytes()
268+
let cbor_bytes = self
269+
.to_bytes()
269270
.map_err(|e| cid_v1::CidError::Encoding(e.to_string()))?;
270271
cid_v1::to_cid_v1(&cbor_bytes)
271272
}

‎rust/signed_doc/src/metadata/document_refs/doc_locator.rs‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ use std::{fmt::Display, ops::Deref, str::FromStr};
77
use cbork_utils::{decode_context::DecodeCtx, map::Map};
88
use minicbor::{Decode, Decoder, Encode};
99

10-
use crate::cid_v1::{Cid, CidError};
11-
use crate::metadata::document_refs::DocRefError;
10+
use crate::{
11+
cid_v1::{Cid, CidError},
12+
metadata::document_refs::DocRefError,
13+
};
1214

1315
/// CID map key.
1416
const CID_MAP_KEY: &str = "cid";
@@ -56,8 +58,7 @@ impl FromStr for DocLocator {
5658
type Err = DocRefError;
5759

5860
fn from_str(s: &str) -> Result<Self, Self::Err> {
59-
let cid = Cid::from_str(s)
60-
.map_err(|e| DocRefError::StringConversion(e.to_string()))?;
61+
let cid = Cid::from_str(s).map_err(|e| DocRefError::StringConversion(e.to_string()))?;
6162
Ok(Self(cid))
6263
}
6364
}
@@ -107,11 +108,10 @@ impl Decode<'_, ()> for DocLocator {
107108
let mut value_decoder = minicbor::Decoder::new(&entry.value);
108109

109110
// Decode the Cid, which validates tag(42) and CID format
110-
let cid = Cid::decode(&mut value_decoder, &mut ())
111-
.map_err(|e| {
112-
let msg = format!("{CONTEXT}: {e}");
113-
e.with_message(msg)
114-
})?;
111+
let cid = Cid::decode(&mut value_decoder, &mut ()).map_err(|e| {
112+
let msg = format!("{CONTEXT}: {e}");
113+
e.with_message(msg)
114+
})?;
115115

116116
Ok(DocLocator(cid))
117117
},
@@ -184,14 +184,19 @@ pub(crate) mod tests {
184184
fn test_doc_locator_display() {
185185
let locator = create_dummy_doc_locator();
186186
let display_str = locator.to_string();
187-
assert!(display_str.starts_with('b'), "Should use multibase format starting with 'b'");
187+
assert!(
188+
display_str.starts_with('b'),
189+
"Should use multibase format starting with 'b'"
190+
);
188191
}
189192

190193
#[test]
191194
fn test_doc_locator_from_str() {
192195
let locator = create_dummy_doc_locator();
193196
let display_str = locator.to_string();
194-
let parsed = display_str.parse::<DocLocator>().expect("Should parse multibase string");
197+
let parsed = display_str
198+
.parse::<DocLocator>()
199+
.expect("Should parse multibase string");
195200
assert_eq!(locator, parsed);
196201
}
197202

‎rust/signed_doc/src/metadata/document_refs/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ impl Decode<'_, CompatibilityPolicy> for DocumentRefs {
104104

105105
Ok(DocumentRefs(doc_refs))
106106
},
107-
// Old structure (id, ver) - no longer supported as DocLocator requires a valid CID
107+
// Old structure (id, ver) - no longer supported as DocLocator requires a valid
108+
// CID
108109
minicbor::data::Type::Tag => {
109110
Err(minicbor::decode::Error::message(format!(
110111
"{CONTEXT}: Legacy document reference format (id, ver) without CID is no longer supported. \
@@ -198,8 +199,7 @@ mod tests {
198199
use minicbor::{Decoder, Encoder};
199200
use test_case::test_case;
200201

201-
use super::*;
202-
use super::doc_locator::tests::create_dummy_doc_locator;
202+
use super::{doc_locator::tests::create_dummy_doc_locator, *};
203203

204204
#[test_case(
205205
CompatibilityPolicy::Accept,

‎rust/signed_doc/src/validator/rules/doc_ref/tests.rs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ use test_case::test_case;
33

44
use super::*;
55
use crate::{
6-
DocumentRef, builder::tests::Builder, metadata::SupportedField,
7-
metadata::document_refs::doc_locator::tests::create_dummy_doc_locator,
6+
DocumentRef,
7+
builder::tests::Builder,
8+
metadata::{SupportedField, document_refs::doc_locator::tests::create_dummy_doc_locator},
89
providers::tests::TestCatalystProvider,
910
};
1011

@@ -328,7 +329,12 @@ async fn ref_rule_not_specified_test() {
328329
let ref_ver = UuidV7::new();
329330
let doc = Builder::new()
330331
.with_metadata_field(SupportedField::Ref(
331-
vec![DocumentRef::new(ref_id, ref_ver, create_dummy_doc_locator())].into(),
332+
vec![DocumentRef::new(
333+
ref_id,
334+
ref_ver,
335+
create_dummy_doc_locator(),
336+
)]
337+
.into(),
332338
))
333339
.build();
334340
assert!(!rule.check(&doc, &provider).await.unwrap());

‎rust/signed_doc/src/validator/rules/ownership/tests/ref_field_based.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ use test_case::test_case;
88
use crate::{
99
CatalystSignedDocument, DocumentRef,
1010
builder::tests::Builder,
11-
metadata::SupportedField,
12-
metadata::document_refs::doc_locator::tests::create_dummy_doc_locator,
11+
metadata::{SupportedField, document_refs::doc_locator::tests::create_dummy_doc_locator},
1312
providers::tests::TestCatalystProvider,
1413
validator::rules::{DocumentOwnershipRule, utils::create_dummy_key_pair},
1514
};

‎rust/signed_doc/src/validator/rules/parameters/tests.rs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ use test_case::test_case;
33

44
use super::*;
55
use crate::{
6-
DocumentRef, builder::tests::Builder, metadata::SupportedField,
7-
metadata::document_refs::doc_locator::tests::create_dummy_doc_locator,
6+
DocumentRef,
7+
builder::tests::Builder,
8+
metadata::{SupportedField, document_refs::doc_locator::tests::create_dummy_doc_locator},
89
providers::tests::TestCatalystProvider,
910
};
1011

@@ -546,7 +547,12 @@ async fn parameters_rule_not_specified_test() {
546547
let ref_ver = UuidV7::new();
547548
let doc = Builder::new()
548549
.with_metadata_field(SupportedField::Parameters(
549-
vec![DocumentRef::new(ref_id, ref_ver, create_dummy_doc_locator())].into(),
550+
vec![DocumentRef::new(
551+
ref_id,
552+
ref_ver,
553+
create_dummy_doc_locator(),
554+
)]
555+
.into(),
550556
))
551557
.build();
552558
assert!(!rule.check(&doc, &provider).await.unwrap());

‎rust/signed_doc/src/validator/rules/reply/tests.rs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ use test_case::test_case;
33

44
use super::*;
55
use crate::{
6-
DocumentRef, DocumentRefs, builder::tests::Builder, metadata::SupportedField,
7-
metadata::document_refs::doc_locator::tests::create_dummy_doc_locator,
6+
DocumentRef, DocumentRefs,
7+
builder::tests::Builder,
8+
metadata::{SupportedField, document_refs::doc_locator::tests::create_dummy_doc_locator},
89
providers::tests::TestCatalystProvider,
910
};
1011

@@ -268,7 +269,12 @@ async fn reply_rule_not_specified_test() {
268269
let ref_ver = UuidV7::new();
269270
let doc = Builder::new()
270271
.with_metadata_field(SupportedField::Reply(
271-
vec![DocumentRef::new(ref_id, ref_ver, create_dummy_doc_locator())].into(),
272+
vec![DocumentRef::new(
273+
ref_id,
274+
ref_ver,
275+
create_dummy_doc_locator(),
276+
)]
277+
.into(),
272278
))
273279
.build();
274280
assert!(!rule.check(&doc, &provider).await.unwrap());

‎rust/signed_doc/src/validator/rules/signature/tests.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use ed25519_dalek::ed25519::signature::Signer;
55

66
use super::*;
77
use crate::{
8-
metadata::document_refs::{doc_locator::tests::create_dummy_doc_locator, DocumentRef},
8+
metadata::document_refs::{DocumentRef, doc_locator::tests::create_dummy_doc_locator},
99
providers::tests::*,
1010
validator::rules::utils::create_dummy_key_pair,
1111
*,
@@ -205,7 +205,11 @@ fn parameters_alias_field(
205205
// empty unprotected headers
206206
e.map(1)?;
207207
e.str(alias)?.encode_with(
208-
DocumentRef::new(UuidV7::new(), UuidV7::new(), crate::metadata::document_refs::doc_locator::tests::create_dummy_doc_locator()),
208+
DocumentRef::new(
209+
UuidV7::new(),
210+
UuidV7::new(),
211+
crate::metadata::document_refs::doc_locator::tests::create_dummy_doc_locator(),
212+
),
209213
&mut (),
210214
)?;
211215
// content (random bytes)

‎rust/signed_doc/src/validator/rules/template/tests.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ use test_case::test_case;
33

44
use super::*;
55
use crate::{
6-
DocumentRef, builder::tests::Builder, metadata::SupportedField,
7-
metadata::document_refs::doc_locator::tests::create_dummy_doc_locator,
6+
DocumentRef,
7+
builder::tests::Builder,
8+
metadata::{SupportedField, document_refs::doc_locator::tests::create_dummy_doc_locator},
89
providers::tests::TestCatalystProvider,
910
};
1011

0 commit comments

Comments
 (0)