Skip to content

Commit bb3b10e

Browse files
apskhemapskhem
committed
chore: fmtfix
1 parent 9343cdf commit bb3b10e

File tree

6 files changed

+37
-38
lines changed

6 files changed

+37
-38
lines changed

‎rust/cardano-chain-follower/src/metadata/cip36.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ impl Cip36 {
9191
/// Nothing. IF CIP36 Metadata is found it will be updated in `decoded_metadata`.
9292
#[allow(clippy::too_many_lines)]
9393
pub(crate) fn decode_and_validate(
94-
decoded_metadata: &DecodedMetadata, slot: u64, txn: &MultiEraTxWithRawAuxiliary, raw_aux_data: &RawAuxData,
95-
catalyst_strict: bool, chain: Network,
94+
decoded_metadata: &DecodedMetadata, slot: u64, txn: &MultiEraTxWithRawAuxiliary,
95+
raw_aux_data: &RawAuxData, catalyst_strict: bool, chain: Network,
9696
) {
9797
let k61284 = raw_aux_data.get_metadata(LABEL);
9898
let k61285 = raw_aux_data.get_metadata(SIG_LABEL);

‎rust/cardano-chain-follower/src/metadata/cip509/mod.rs‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ impl Cip509 {
189189
///
190190
/// Nothing. IF CIP509 Metadata is found it will be updated in `decoded_metadata`.
191191
pub(crate) fn decode_and_validate(
192-
decoded_metadata: &DecodedMetadata, txn: &MultiEraTxWithRawAuxiliary, raw_aux_data: &RawAuxData,
193-
txn_idx: usize,
192+
decoded_metadata: &DecodedMetadata, txn: &MultiEraTxWithRawAuxiliary,
193+
raw_aux_data: &RawAuxData, txn_idx: usize,
194194
) {
195195
// Get the CIP509 metadata if possible
196196
let Some(k509) = raw_aux_data.get_metadata(LABEL) else {
@@ -540,7 +540,9 @@ impl Cip509 {
540540
) -> Option<bool> {
541541
let mut pk_addrs = Vec::new();
542542
match txn {
543-
MultiEraTxWithRawAuxiliary::AlonzoCompatible(..) | MultiEraTxWithRawAuxiliary::Babbage(_) | MultiEraTxWithRawAuxiliary::Conway(_) => {
543+
MultiEraTxWithRawAuxiliary::AlonzoCompatible(..)
544+
| MultiEraTxWithRawAuxiliary::Babbage(_)
545+
| MultiEraTxWithRawAuxiliary::Conway(_) => {
544546
// X509 certificate
545547
if let Some(x509_certs) = &self.x509_chunks.0.x509_certs {
546548
for cert in x509_certs {
@@ -1079,8 +1081,9 @@ mod tests {
10791081
let decoded_metadata = DecodedMetadata(DashMap::new());
10801082
let mut validation_report = ValidationReport::new();
10811083
let conway_block_data = conway_1();
1082-
let multi_era_block = pallas::ledger::traverse::MultiEraBlockWithRawAuxiliary::decode(&conway_block_data)
1083-
.expect("Failed to decode MultiEraBlock");
1084+
let multi_era_block =
1085+
pallas::ledger::traverse::MultiEraBlockWithRawAuxiliary::decode(&conway_block_data)
1086+
.expect("Failed to decode MultiEraBlock");
10841087

10851088
let transactions = multi_era_block.txs();
10861089
// Forth transaction of this test data contains the CIP509 auxiliary data
@@ -1101,8 +1104,9 @@ mod tests {
11011104
let decoded_metadata = DecodedMetadata(DashMap::new());
11021105
let mut validation_report = ValidationReport::new();
11031106
let conway_block_data = conway_1();
1104-
let multi_era_block = pallas::ledger::traverse::MultiEraBlockWithRawAuxiliary::decode(&conway_block_data)
1105-
.expect("Failed to decode MultiEraBlock");
1107+
let multi_era_block =
1108+
pallas::ledger::traverse::MultiEraBlockWithRawAuxiliary::decode(&conway_block_data)
1109+
.expect("Failed to decode MultiEraBlock");
11061110

11071111
let transactions = multi_era_block.txs();
11081112
// Forth transaction of this test data contains the CIP509 auxiliary data
@@ -1124,8 +1128,9 @@ mod tests {
11241128
let decoded_metadata = DecodedMetadata(DashMap::new());
11251129
let mut validation_report = ValidationReport::new();
11261130
let conway_block_data = conway_1();
1127-
let multi_era_block = pallas::ledger::traverse::MultiEraBlockWithRawAuxiliary::decode(&conway_block_data)
1128-
.expect("Failed to decode MultiEraBlock");
1131+
let multi_era_block =
1132+
pallas::ledger::traverse::MultiEraBlockWithRawAuxiliary::decode(&conway_block_data)
1133+
.expect("Failed to decode MultiEraBlock");
11291134

11301135
let transactions = multi_era_block.txs();
11311136
// Forth transaction of this test data contains the CIP509 auxiliary data
@@ -1147,8 +1152,9 @@ mod tests {
11471152
let decoded_metadata = DecodedMetadata(DashMap::new());
11481153
let mut validation_report = ValidationReport::new();
11491154
let conway_block_data = conway_1();
1150-
let multi_era_block = pallas::ledger::traverse::MultiEraBlockWithRawAuxiliary::decode(&conway_block_data)
1151-
.expect("Failed to decode MultiEraBlock");
1155+
let multi_era_block =
1156+
pallas::ledger::traverse::MultiEraBlockWithRawAuxiliary::decode(&conway_block_data)
1157+
.expect("Failed to decode MultiEraBlock");
11521158

11531159
let transactions = multi_era_block.txs();
11541160
// Forth transaction of this test data contains the CIP509 auxiliary data
@@ -1183,8 +1189,9 @@ mod tests {
11831189
let decoded_metadata = DecodedMetadata(DashMap::new());
11841190
let mut validation_report = ValidationReport::new();
11851191
let conway_block_data = conway_3();
1186-
let multi_era_block = pallas::ledger::traverse::MultiEraBlockWithRawAuxiliary::decode(&conway_block_data)
1187-
.expect("Failed to decode MultiEraBlock");
1192+
let multi_era_block =
1193+
pallas::ledger::traverse::MultiEraBlockWithRawAuxiliary::decode(&conway_block_data)
1194+
.expect("Failed to decode MultiEraBlock");
11881195

11891196
let transactions = multi_era_block.txs();
11901197
// First transaction of this test data contains the CIP509 auxiliary data
@@ -1220,8 +1227,9 @@ mod tests {
12201227
let decoded_metadata = DecodedMetadata(DashMap::new());
12211228
let mut validation_report = ValidationReport::new();
12221229
let conway_block_data = conway_2();
1223-
let multi_era_block = pallas::ledger::traverse::MultiEraBlockWithRawAuxiliary::decode(&conway_block_data)
1224-
.expect("Failed to decode MultiEraBlock");
1230+
let multi_era_block =
1231+
pallas::ledger::traverse::MultiEraBlockWithRawAuxiliary::decode(&conway_block_data)
1232+
.expect("Failed to decode MultiEraBlock");
12251233

12261234
let transactions = multi_era_block.txs();
12271235
// Forth transaction of this test data contains the CIP509 auxiliary data

‎rust/cardano-chain-follower/src/metadata/mod.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ pub(crate) struct DecodedMetadata(DashMap<u64, Arc<DecodedMetadataItem>>);
5050
impl DecodedMetadata {
5151
/// Create new decoded metadata for a transaction.
5252
fn new(
53-
chain: Network, slot: u64, txn: &MultiEraTxWithRawAuxiliary, raw_aux_data: &RawAuxData, txn_idx: usize,
53+
chain: Network, slot: u64, txn: &MultiEraTxWithRawAuxiliary, raw_aux_data: &RawAuxData,
54+
txn_idx: usize,
5455
) -> Self {
5556
let decoded_metadata = Self(DashMap::new());
5657

‎rust/cardano-chain-follower/src/mithril_snapshot_iterator.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ impl MithrilSnapshotIterator {
8686

8787
match next {
8888
Some(Ok(raw_block)) => {
89-
let Ok(block) = MultiEraBlockWithRawAuxiliary::decode(&raw_block)
90-
else {
89+
let Ok(block) = MultiEraBlockWithRawAuxiliary::decode(&raw_block) else {
9190
return None;
9291
};
9392

@@ -238,9 +237,7 @@ impl Iterator for MithrilSnapshotIteratorInner {
238237

239238
// We cannot fully decode this block because we don't know its previous point,
240239
// So this MUST be the first block in iteration, so use it as the previous.
241-
if let Ok(raw_decoded_block) =
242-
MultiEraBlockWithRawAuxiliary::decode(&block)
243-
{
240+
if let Ok(raw_decoded_block) = MultiEraBlockWithRawAuxiliary::decode(&block) {
244241
// debug!("Pre Previous update 2 : {:?}", self.previous);
245242
self.previous =
246243
Point::new(raw_decoded_block.slot(), raw_decoded_block.hash().to_vec());

‎rust/cardano-chain-follower/src/multi_era_block_data.rs‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,7 @@ impl MultiEraBlock {
103103

104104
let point = Point::new(slot, decoded_block.hash().to_vec());
105105

106-
let byron_block = matches!(
107-
decoded_block,
108-
MultiEraBlockWithRawAuxiliary::Byron(_)
109-
);
106+
let byron_block = matches!(decoded_block, MultiEraBlockWithRawAuxiliary::Byron(_));
110107

111108
// debug!("New Block: {slot} {point} {}", *previous);
112109

@@ -309,9 +306,7 @@ impl Display for MultiEraBlock {
309306
};
310307

311308
let block_era = match block {
312-
MultiEraBlockWithRawAuxiliary::EpochBoundary(_) => {
313-
"Byron Epoch Boundary".to_string()
314-
},
309+
MultiEraBlockWithRawAuxiliary::EpochBoundary(_) => "Byron Epoch Boundary".to_string(),
315310
MultiEraBlockWithRawAuxiliary::AlonzoCompatible(_, era) => {
316311
format!("{era}")
317312
},
@@ -458,8 +453,7 @@ pub(crate) mod tests {
458453
#[test]
459454
fn test_multi_era_block_point_compare_1() -> anyhow::Result<()> {
460455
for (i, test_block) in test_blocks().into_iter().enumerate() {
461-
let pallas_block =
462-
MultiEraBlockWithRawAuxiliary::decode(test_block.raw.as_slice())?;
456+
let pallas_block = MultiEraBlockWithRawAuxiliary::decode(test_block.raw.as_slice())?;
463457

464458
let previous_point = Point::new(
465459
pallas_block.slot().add(i as u64),
@@ -483,8 +477,7 @@ pub(crate) mod tests {
483477
#[test]
484478
fn test_multi_era_block_point_compare_2() -> anyhow::Result<()> {
485479
for test_block in test_blocks() {
486-
let pallas_block =
487-
MultiEraBlockWithRawAuxiliary::decode(test_block.raw.as_slice())?;
480+
let pallas_block = MultiEraBlockWithRawAuxiliary::decode(test_block.raw.as_slice())?;
488481

489482
let previous_point = Point::new(pallas_block.slot() - 1, vec![0; 32]);
490483

@@ -501,8 +494,7 @@ pub(crate) mod tests {
501494
#[test]
502495
fn test_multi_era_block_point_compare_3() -> anyhow::Result<()> {
503496
for test_block in test_blocks() {
504-
let pallas_block =
505-
MultiEraBlockWithRawAuxiliary::decode(test_block.raw.as_slice())?;
497+
let pallas_block = MultiEraBlockWithRawAuxiliary::decode(test_block.raw.as_slice())?;
506498

507499
let previous_point = Point::new(
508500
pallas_block.slot() - 1,

‎rust/cardano-chain-follower/src/witness.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,9 @@ mod tests {
117117
assert!(tx_witness_alonzo.check_witness_in_tx(&vkey1_hash, 0));
118118

119119
let babbage = babbage_block();
120-
let babbage_block = pallas::ledger::traverse::MultiEraBlockWithRawAuxiliary::decode(&babbage)
121-
.expect("Failed to decode MultiEraBlock");
120+
let babbage_block =
121+
pallas::ledger::traverse::MultiEraBlockWithRawAuxiliary::decode(&babbage)
122+
.expect("Failed to decode MultiEraBlock");
122123
let txs_babbage = babbage_block.txs();
123124
let tx_witness_babbage = TxWitness::new(&txs_babbage).expect("Failed to create TxWitness");
124125
let vkey2_hash: [u8; 28] =

0 commit comments

Comments
 (0)