Skip to content

Commit 4e0d965

Browse files
Fmt Botgithub-actions[bot]
authored andcommitted
2025-10-26 automated rustfmt nightly
1 parent c4a2e91 commit 4e0d965

File tree

2 files changed

+23
-34
lines changed

2 files changed

+23
-34
lines changed

consensus_encoding/src/encode/encoders.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ impl<'sl> BytesEncoder<'sl> {
3030
}
3131

3232
impl Encoder for BytesEncoder<'_> {
33-
fn current_chunk(&self) -> &[u8] {
34-
self.sl.unwrap_or_default()
35-
}
33+
fn current_chunk(&self) -> &[u8] { self.sl.unwrap_or_default() }
3634

3735
fn advance(&mut self) -> bool {
3836
self.sl = None;
@@ -592,10 +590,7 @@ mod tests {
592590

593591
// 0xFF + u64
594592
let mut e = CompactSizeEncoder::new(0x0000_F0F0_F0F0_F0E0u64);
595-
assert_eq!(
596-
e.current_chunk(),
597-
&[0xFF, 0xE0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0x00, 0x00][..]
598-
);
593+
assert_eq!(e.current_chunk(), &[0xFF, 0xE0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0x00, 0x00][..]);
599594
assert!(!e.advance());
600595
assert!(e.current_chunk().is_empty());
601596
}

primitives/src/transaction.rs

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -393,32 +393,27 @@ impl Decoder for TransactionDecoder {
393393
// Still more bytes required.
394394
return Ok(true);
395395
}
396-
},
397-
State::Inputs(_, _, decoder) => {
396+
}
397+
State::Inputs(_, _, decoder) =>
398398
if decoder.push_bytes(bytes)? {
399399
return Ok(true);
400-
}
401-
},
402-
State::SegwitFlag(_) => {
400+
},
401+
State::SegwitFlag(_) =>
403402
if bytes.is_empty() {
404403
return Ok(true);
405-
}
406-
},
407-
State::Outputs(_, _, _, decoder) => {
404+
},
405+
State::Outputs(_, _, _, decoder) =>
408406
if decoder.push_bytes(bytes)? {
409407
return Ok(true);
410-
}
411-
},
412-
State::Witnesses(_, _, _, _, decoder) => {
408+
},
409+
State::Witnesses(_, _, _, _, decoder) =>
413410
if decoder.push_bytes(bytes)? {
414411
return Ok(true);
415-
}
416-
},
417-
State::LockTime(_, _, _, decoder) => {
412+
},
413+
State::LockTime(_, _, _, decoder) =>
418414
if decoder.push_bytes(bytes)? {
419415
return Ok(true);
420-
}
421-
},
416+
},
422417
State::Done(..) => return Ok(false),
423418
State::Errored => panic!("call to push_bytes() after decoder errored"),
424419
}
@@ -1719,8 +1714,8 @@ mod tests {
17191714
assert_eq!(
17201715
encoder.current_chunk(),
17211716
&[
1722-
32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13,
1723-
12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
1717+
32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12,
1718+
11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
17241719
][..]
17251720
);
17261721
assert!(encoder.advance());
@@ -1766,8 +1761,8 @@ mod tests {
17661761
assert_eq!(
17671762
encoder.current_chunk(),
17681763
&[
1769-
32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13,
1770-
12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
1764+
32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12,
1765+
11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
17711766
][..]
17721767
);
17731768
assert!(encoder.advance());
@@ -1814,8 +1809,8 @@ mod tests {
18141809
assert_eq!(
18151810
encoder.current_chunk(),
18161811
&[
1817-
32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13,
1818-
12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
1812+
32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12,
1813+
11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
18191814
][..]
18201815
);
18211816
assert!(encoder.advance());
@@ -1881,10 +1876,9 @@ mod tests {
18811876
assert_eq!(
18821877
encoder.current_chunk(),
18831878
&[
1884-
32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13,
1885-
12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
1879+
32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12,
1880+
11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
18861881
][..]
1887-
18881882
);
18891883
assert!(encoder.advance());
18901884
assert_eq!(encoder.current_chunk(), &[1u8, 0, 0, 0][..]);
@@ -1998,8 +1992,8 @@ mod tests {
19981992
assert_eq!(
19991993
encoder.current_chunk(),
20001994
&[
2001-
32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13,
2002-
12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
1995+
32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12,
1996+
11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
20031997
][..]
20041998
);
20051999
assert!(encoder.advance());

0 commit comments

Comments
 (0)