Skip to content

Commit d57100e

Browse files
vlopes11vlopes11
committed
fmt
1 parent d47d69e commit d57100e

File tree

50 files changed

+300
-277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+300
-277
lines changed

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

+10-14
Original file line numberDiff line numberDiff line change
@@ -250,27 +250,23 @@ fn parse_public_key(public_key: &str) -> anyhow::Result<PublicKey> {
250250
fn get_key_type(key_type: Option<String>) -> anyhow::Result<(Oid<'static>, Option<String>)> {
251251
match key_type {
252252
None => Err(anyhow::anyhow!("Currently only support Ed25519")),
253-
Some(key_type) => {
254-
match key_type.as_str() {
255-
"ed25519" => Ok(ED25519),
256-
_ => Err(anyhow::anyhow!("Currently only support Ed25519")),
257-
}
253+
Some(key_type) => match key_type.as_str() {
254+
"ed25519" => Ok(ED25519),
255+
_ => Err(anyhow::anyhow!("Currently only support Ed25519")),
258256
},
259257
}
260258
}
261259

262260
/// Parse date string to u64.
263261
fn parse_or_default_date(date_option: Option<String>, default: u64) -> Result<u64, anyhow::Error> {
264262
match date_option {
265-
Some(date) => {
266-
DateTime::parse_from_rfc3339(&date)
267-
.map(|dt| {
268-
dt.timestamp()
269-
.try_into()
270-
.map_err(|_| anyhow::anyhow!("Timestamp is invalid"))
271-
})?
272-
.map_err(|e| anyhow::anyhow!("Failed to parse date {date}: {e}"))
273-
},
263+
Some(date) => DateTime::parse_from_rfc3339(&date)
264+
.map(|dt| {
265+
dt.timestamp()
266+
.try_into()
267+
.map_err(|_| anyhow::anyhow!("Timestamp is invalid"))
268+
})?
269+
.map_err(|e| anyhow::anyhow!("Failed to parse date {date}: {e}")),
274270
None => Ok(default),
275271
}
276272
}

‎rust/c509-certificate/src/attributes/attribute.rs

+19-21
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ struct Helper {
8585

8686
impl<'de> Deserialize<'de> for Attribute {
8787
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
88-
where D: Deserializer<'de> {
88+
where
89+
D: Deserializer<'de>,
90+
{
8991
let helper = Helper::deserialize(deserializer)?;
9092
let oid =
9193
Oid::from_str(&helper.oid).map_err(|e| serde::de::Error::custom(format!("{e:?}")))?;
@@ -99,7 +101,9 @@ impl<'de> Deserialize<'de> for Attribute {
99101

100102
impl Serialize for Attribute {
101103
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
102-
where S: serde::Serializer {
104+
where
105+
S: serde::Serializer,
106+
{
103107
let helper = Helper {
104108
oid: self.registered_oid().c509_oid().oid().to_string(),
105109
value: self.value.clone(),
@@ -206,25 +210,19 @@ impl Encode<()> for AttributeValue {
206210
impl Decode<'_, ()> for AttributeValue {
207211
fn decode(d: &mut Decoder<'_>, ctx: &mut ()) -> Result<Self, minicbor::decode::Error> {
208212
match decode_datatype(d, "Attribute value")? {
209-
minicbor::data::Type::String => {
210-
Ok(AttributeValue::Text(decode_helper(
211-
d,
212-
"Attribute value",
213-
ctx,
214-
)?))
215-
},
216-
minicbor::data::Type::Bytes => {
217-
Ok(AttributeValue::Bytes(decode_helper(
218-
d,
219-
"Attribute value",
220-
ctx,
221-
)?))
222-
},
223-
_ => {
224-
Err(minicbor::decode::Error::message(
225-
"Invalid AttributeValue, value should be either String or Bytes",
226-
))
227-
},
213+
minicbor::data::Type::String => Ok(AttributeValue::Text(decode_helper(
214+
d,
215+
"Attribute value",
216+
ctx,
217+
)?)),
218+
minicbor::data::Type::Bytes => Ok(AttributeValue::Bytes(decode_helper(
219+
d,
220+
"Attribute value",
221+
ctx,
222+
)?)),
223+
_ => Err(minicbor::decode::Error::message(
224+
"Invalid AttributeValue, value should be either String or Bytes",
225+
)),
228226
}
229227
}
230228
}

‎rust/c509-certificate/src/extensions/alt_name.rs

+6-10
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,12 @@ impl Decode<'_, ()> for GeneralNamesOrText {
104104
gns.add_general_name(gn_dns);
105105
Ok(GeneralNamesOrText::GeneralNames(gns))
106106
},
107-
minicbor::data::Type::Array => {
108-
Ok(GeneralNamesOrText::GeneralNames(GeneralNames::decode(
109-
d, ctx,
110-
)?))
111-
},
112-
_ => {
113-
Err(minicbor::decode::Error::message(
114-
"Invalid type for AlternativeName",
115-
))
116-
},
107+
minicbor::data::Type::Array => Ok(GeneralNamesOrText::GeneralNames(
108+
GeneralNames::decode(d, ctx)?,
109+
)),
110+
_ => Err(minicbor::decode::Error::message(
111+
"Invalid type for AlternativeName",
112+
)),
117113
}
118114
}
119115
}

‎rust/c509-certificate/src/extensions/extension/mod.rs

+11-8
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ struct Helper {
7373

7474
impl<'de> Deserialize<'de> for Extension {
7575
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
76-
where D: Deserializer<'de> {
76+
where
77+
D: Deserializer<'de>,
78+
{
7779
let helper = Helper::deserialize(deserializer)?;
7880
let oid =
7981
Oid::from_str(&helper.oid).map_err(|e| serde::de::Error::custom(format!("{e:?}")))?;
@@ -84,7 +86,9 @@ impl<'de> Deserialize<'de> for Extension {
8486

8587
impl Serialize for Extension {
8688
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
87-
where S: serde::Serializer {
89+
where
90+
S: serde::Serializer,
91+
{
8892
let helper = Helper {
8993
oid: self.registered_oid.c509_oid().oid().to_string(),
9094
value: self.value.clone(),
@@ -237,7 +241,8 @@ impl Encode<()> for ExtensionValue {
237241
}
238242

239243
impl<C> Decode<'_, C> for ExtensionValue
240-
where C: ExtensionValueTypeTrait + Debug
244+
where
245+
C: ExtensionValueTypeTrait + Debug,
241246
{
242247
fn decode(d: &mut Decoder<'_>, ctx: &mut C) -> Result<Self, minicbor::decode::Error> {
243248
match ctx.get_type() {
@@ -253,11 +258,9 @@ where C: ExtensionValueTypeTrait + Debug
253258
let value = AlternativeName::decode(d, &mut ())?;
254259
Ok(ExtensionValue::AlternativeName(value))
255260
},
256-
ExtensionValueType::Unsupported => {
257-
Err(minicbor::decode::Error::message(
258-
"Cannot decode Unsupported extension value",
259-
))
260-
},
261+
ExtensionValueType::Unsupported => Err(minicbor::decode::Error::message(
262+
"Cannot decode Unsupported extension value",
263+
)),
261264
}
262265
}
263266
}

‎rust/c509-certificate/src/general_names/general_name.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,8 @@ impl Encode<()> for GeneralNameValue {
186186
}
187187
}
188188
impl<C> Decode<'_, C> for GeneralNameValue
189-
where C: GeneralNameValueTrait + Debug
189+
where
190+
C: GeneralNameValueTrait + Debug,
190191
{
191192
fn decode(d: &mut Decoder<'_>, ctx: &mut C) -> Result<Self, minicbor::decode::Error> {
192193
match ctx.get_type() {
@@ -210,11 +211,9 @@ where C: GeneralNameValueTrait + Debug
210211
let value = Name::decode(d, &mut ())?;
211212
Ok(GeneralNameValue::Name(value))
212213
},
213-
GeneralNameValueType::Unsupported => {
214-
Err(minicbor::decode::Error::message(
215-
"Cannot decode Unsupported GeneralName value",
216-
))
217-
},
214+
GeneralNameValueType::Unsupported => Err(minicbor::decode::Error::message(
215+
"Cannot decode Unsupported GeneralName value",
216+
)),
218217
}
219218
}
220219
}
@@ -255,9 +254,10 @@ mod test_general_name {
255254
let mut buffer = Vec::new();
256255
let mut encoder = Encoder::new(&mut buffer);
257256

258-
let hw = OtherNameHardwareModuleName::new(oid!(2.16.840 .1 .101 .3 .4 .2 .1), vec![
259-
0x01, 0x02, 0x03, 0x04,
260-
]);
257+
let hw = OtherNameHardwareModuleName::new(
258+
oid!(2.16.840 .1 .101 .3 .4 .2 .1),
259+
vec![0x01, 0x02, 0x03, 0x04],
260+
);
261261
let gn = GeneralName::new(
262262
GeneralNameTypeRegistry::OtherNameHardwareModuleName,
263263
GeneralNameValue::OtherNameHWModuleName(hw),

‎rust/c509-certificate/src/helper/decode.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ use minicbor::{decode, Decoder};
66
pub(crate) fn decode_helper<'a, T, C>(
77
d: &mut Decoder<'a>, from: &str, context: &mut C,
88
) -> Result<T, decode::Error>
9-
where T: minicbor::Decode<'a, C> {
9+
where
10+
T: minicbor::Decode<'a, C>,
11+
{
1012
T::decode(d, context).map_err(|e| {
1113
decode::Error::message(format!(
1214
"Failed to decode {:?} in {from}: {e}",

‎rust/c509-certificate/src/helper/encode.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ use minicbor::{
99
pub(crate) fn encode_helper<W: Write, C, T>(
1010
e: &mut Encoder<W>, from: &str, ctx: &mut C, value: &T,
1111
) -> Result<(), encode::Error<W::Error>>
12-
where T: minicbor::Encode<C> {
12+
where
13+
T: minicbor::Encode<C>,
14+
{
1315
T::encode(value, e, ctx).map_err(|err| {
1416
encode::Error::with_message(
1517
err,

‎rust/c509-certificate/src/issuer_sig_algo/mod.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ struct Helper {
7272

7373
impl<'de> Deserialize<'de> for IssuerSignatureAlgorithm {
7474
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
75-
where D: Deserializer<'de> {
75+
where
76+
D: Deserializer<'de>,
77+
{
7678
let helper = Helper::deserialize(deserializer)?;
7779
let oid =
7880
Oid::from_str(&helper.oid).map_err(|e| serde::de::Error::custom(format!("{e:?}")))?;
@@ -83,7 +85,9 @@ impl<'de> Deserialize<'de> for IssuerSignatureAlgorithm {
8385

8486
impl Serialize for IssuerSignatureAlgorithm {
8587
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
86-
where S: serde::Serializer {
88+
where
89+
S: serde::Serializer,
90+
{
8791
let helper = Helper {
8892
oid: self.registered_oid.c509_oid().oid().to_string(),
8993
param: self.algo_identifier.param().clone(),

‎rust/c509-certificate/src/name/mod.rs

+6-10
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,9 @@ impl Decode<'_, ()> for NameValue {
155155
Ok(create_attributes_with_cn(decode_helper(d, "Name", ctx)?))
156156
},
157157
minicbor::data::Type::Bytes => decode_bytes_helper(d),
158-
_ => {
159-
Err(minicbor::decode::Error::message(
160-
"Name must be an array, text or bytes",
161-
))
162-
},
158+
_ => Err(minicbor::decode::Error::message(
159+
"Name must be an array, text or bytes",
160+
)),
163161
}
164162
}
165163
}
@@ -294,11 +292,9 @@ fn decode_eui_cn_bytes(bytes: &[u8]) -> Result<NameValue, minicbor::decode::Erro
294292
)?);
295293
Ok(create_attributes_with_cn(text))
296294
},
297-
_ => {
298-
Err(minicbor::decode::Error::message(
299-
"EUI-64 or MAC address must be 7 or 9 bytes",
300-
))
301-
},
295+
_ => Err(minicbor::decode::Error::message(
296+
"EUI-64 or MAC address must be 7 or 9 bytes",
297+
)),
302298
}
303299
}
304300

‎rust/c509-certificate/src/oid.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ impl C509oid {
7676

7777
impl<'de> Deserialize<'de> for C509oid {
7878
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
79-
where D: Deserializer<'de> {
79+
where
80+
D: Deserializer<'de>,
81+
{
8082
let helper = Helper::deserialize(deserializer)?;
8183
let oid =
8284
Oid::from_str(&helper.oid).map_err(|e| serde::de::Error::custom(format!("{e:?}")))?;
@@ -86,7 +88,9 @@ impl<'de> Deserialize<'de> for C509oid {
8688

8789
impl Serialize for C509oid {
8890
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
89-
where S: serde::Serializer {
91+
where
92+
S: serde::Serializer,
93+
{
9094
let helper = Helper {
9195
oid: self.0.to_string(),
9296
};

‎rust/c509-certificate/src/subject_pub_key_algo/mod.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ struct Helper {
7373

7474
impl<'de> Deserialize<'de> for SubjectPubKeyAlgorithm {
7575
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
76-
where D: Deserializer<'de> {
76+
where
77+
D: Deserializer<'de>,
78+
{
7779
let helper = Helper::deserialize(deserializer)?;
7880
let oid =
7981
Oid::from_str(&helper.oid).map_err(|e| serde::de::Error::custom(format!("{e:?}")))?;
@@ -84,7 +86,9 @@ impl<'de> Deserialize<'de> for SubjectPubKeyAlgorithm {
8486

8587
impl Serialize for SubjectPubKeyAlgorithm {
8688
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
87-
where S: serde::Serializer {
89+
where
90+
S: serde::Serializer,
91+
{
8892
let helper = Helper {
8993
oid: self.registered_oid.c509_oid().oid().to_string(),
9094
param: self.algo_identifier.param().clone(),

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,10 @@ impl Decode<'_, ()> for TransactionAuxData {
2727
// Check what kind of aux data we have to deal with
2828
match d.datatype() {
2929
// Shelley: https://github.com/IntersectMBO/cardano-ledger/blob/78b32d585fd4a0340fb2b184959fb0d46f32c8d2/eras/conway/impl/cddl-files/conway.cddl#L522
30-
Ok(minicbor::data::Type::Map) => {
31-
Ok(TransactionAuxData {
32-
metadata: Metadata::decode(d, &mut ())?,
33-
scripts: TransactionScripts::default(),
34-
})
35-
},
30+
Ok(minicbor::data::Type::Map) => Ok(TransactionAuxData {
31+
metadata: Metadata::decode(d, &mut ())?,
32+
scripts: TransactionScripts::default(),
33+
}),
3634
// Shelley-MA: https://github.com/IntersectMBO/cardano-ledger/blob/78b32d585fd4a0340fb2b184959fb0d46f32c8d2/eras/conway/impl/cddl-files/conway.cddl#L523
3735
Ok(minicbor::data::Type::Array) => Self::decode_shelley_ma_array(d),
3836
// Maybe Alonzo and beyond: https://github.com/IntersectMBO/cardano-ledger/blob/78b32d585fd4a0340fb2b184959fb0d46f32c8d2/eras/conway/impl/cddl-files/conway.cddl#L526

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

+5-7
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,11 @@ impl Decode<'_, ()> for Metadata {
6363
d: &mut minicbor::Decoder<'_>, ctx: &mut (),
6464
) -> Result<Self, minicbor::decode::Error> {
6565
let (entries, mut sequence, metadata) = match d.map() {
66-
Ok(Some(entries)) => {
67-
(
68-
entries,
69-
Vec::with_capacity(from_saturating(entries)),
70-
DashMap::with_capacity(from_saturating(entries)),
71-
)
72-
},
66+
Ok(Some(entries)) => (
67+
entries,
68+
Vec::with_capacity(from_saturating(entries)),
69+
DashMap::with_capacity(from_saturating(entries)),
70+
),
7371
Ok(None) => {
7472
// Sadly... Indefinite Maps are allowed in Cardano CBOR Encoding.
7573
(u64::MAX, Vec::new(), DashMap::new())

‎rust/cardano-blockchain-types/src/metadata/cip36/key_registration.rs

+11-13
Original file line numberDiff line numberDiff line change
@@ -308,19 +308,17 @@ fn decode_payment_addr(
308308
let raw_addr = decode_bytes(d, "CIP36 Key Registration payment address")?;
309309
// Cannot convert raw address to Address type
310310
match Address::from_bytes(&raw_addr) {
311-
Ok(addr) => {
312-
match addr {
313-
Address::Byron(byron_address) => {
314-
err_report.invalid_value(
315-
"Address",
316-
format!("{byron_address:?}").as_str(),
317-
"Expected non Byron address",
318-
"CIP36 Key Registration payment address",
319-
);
320-
Ok(None)
321-
},
322-
_ => Ok(Some(addr)),
323-
}
311+
Ok(addr) => match addr {
312+
Address::Byron(byron_address) => {
313+
err_report.invalid_value(
314+
"Address",
315+
format!("{byron_address:?}").as_str(),
316+
"Expected non Byron address",
317+
"CIP36 Key Registration payment address",
318+
);
319+
Ok(None)
320+
},
321+
_ => Ok(Some(addr)),
324322
},
325323
Err(e) => {
326324
err_report.conversion_error(

0 commit comments

Comments
 (0)