|
8 | 8 | use alloc::borrow::{Cow, ToOwned}; |
9 | 9 | use alloc::boxed::Box; |
10 | 10 | use alloc::string::String; |
11 | | -use alloc::vec::Vec; |
12 | 11 | use alloc::vec; |
| 12 | +use alloc::vec::Vec; |
13 | 13 | use core::{cmp, fmt}; |
14 | 14 |
|
| 15 | +use bitcoin::block::HeaderExt; |
15 | 16 | use bitcoin::consensus::encode::{self, Decodable, Encodable, ReadExt, WriteExt}; |
16 | 17 | use bitcoin::merkle_tree::MerkleBlock; |
17 | | -use bitcoin::{block, block::HeaderExt, transaction}; |
| 18 | +use bitcoin::{block, transaction}; |
18 | 19 | use hashes::sha256d; |
19 | 20 | use internals::ToU64 as _; |
20 | 21 | use io::{self, BufRead, Read, Write}; |
@@ -421,8 +422,7 @@ impl Encodable for NetworkMessage { |
421 | 422 | NetworkMessage::GetHeaders(ref dat) => dat.consensus_encode(writer), |
422 | 423 | NetworkMessage::Tx(ref dat) => dat.consensus_encode(writer), |
423 | 424 | NetworkMessage::Block(ref dat) => dat.consensus_encode(writer), |
424 | | - NetworkMessage::Headers(ref dat) => |
425 | | - dat.consensus_encode(writer), |
| 425 | + NetworkMessage::Headers(ref dat) => dat.consensus_encode(writer), |
426 | 426 | NetworkMessage::Ping(ref dat) => dat.consensus_encode(writer), |
427 | 427 | NetworkMessage::Pong(ref dat) => dat.consensus_encode(writer), |
428 | 428 | NetworkMessage::MerkleBlock(ref dat) => dat.consensus_encode(writer), |
@@ -538,13 +538,11 @@ impl HeadersMessage { |
538 | 538 |
|
539 | 539 | /// Each header passes its own proof-of-work target. |
540 | 540 | pub fn all_targets_satisfied(&self) -> bool { |
541 | | - !self.0 |
542 | | - .iter() |
543 | | - .any(|header| { |
544 | | - let target = header.target(); |
545 | | - let valid_pow = header.validate_pow(target); |
546 | | - valid_pow.is_err() |
547 | | - }) |
| 541 | + !self.0.iter().any(|header| { |
| 542 | + let target = header.target(); |
| 543 | + let valid_pow = header.validate_pow(target); |
| 544 | + valid_pow.is_err() |
| 545 | + }) |
548 | 546 | } |
549 | 547 | } |
550 | 548 |
|
@@ -732,9 +730,8 @@ impl Decodable for V2NetworkMessage { |
732 | 730 | 10u8 => NetworkMessage::GetBlockTxn(Decodable::consensus_decode_from_finite_reader(r)?), |
733 | 731 | 11u8 => NetworkMessage::GetData(Decodable::consensus_decode_from_finite_reader(r)?), |
734 | 732 | 12u8 => NetworkMessage::GetHeaders(Decodable::consensus_decode_from_finite_reader(r)?), |
735 | | - 13u8 => NetworkMessage::Headers( |
736 | | - HeadersMessage::consensus_decode_from_finite_reader(r)?, |
737 | | - ), |
| 733 | + 13u8 => |
| 734 | + NetworkMessage::Headers(HeadersMessage::consensus_decode_from_finite_reader(r)?), |
738 | 735 | 14u8 => NetworkMessage::Inv(Decodable::consensus_decode_from_finite_reader(r)?), |
739 | 736 | 15u8 => NetworkMessage::MemPool, |
740 | 737 | 16u8 => NetworkMessage::MerkleBlock(Decodable::consensus_decode_from_finite_reader(r)?), |
@@ -803,16 +800,21 @@ impl Encodable for CheckedData { |
803 | 800 |
|
804 | 801 | impl Decodable for CheckedData { |
805 | 802 | #[inline] |
806 | | - fn consensus_decode_from_finite_reader<R: BufRead + ?Sized>(r: &mut R) -> Result<Self, encode::Error> { |
| 803 | + fn consensus_decode_from_finite_reader<R: BufRead + ?Sized>( |
| 804 | + r: &mut R, |
| 805 | + ) -> Result<Self, encode::Error> { |
807 | 806 | let len = u32::consensus_decode_from_finite_reader(r)? as usize; |
808 | 807 |
|
809 | 808 | let checksum = <[u8; 4]>::consensus_decode_from_finite_reader(r)?; |
810 | 809 | let opts = ReadBytesFromFiniteReaderOpts { len, chunk_size: encode::MAX_VEC_SIZE }; |
811 | 810 | let data = read_bytes_from_finite_reader(r, opts)?; |
812 | 811 | let expected_checksum = sha2_checksum(&data); |
813 | 812 | if expected_checksum != checksum { |
814 | | - Err(encode::ParseError::InvalidChecksum { expected: expected_checksum, actual: checksum } |
815 | | - .into()) |
| 813 | + Err(encode::ParseError::InvalidChecksum { |
| 814 | + expected: expected_checksum, |
| 815 | + actual: checksum, |
| 816 | + } |
| 817 | + .into()) |
816 | 818 | } else { |
817 | 819 | Ok(CheckedData { data, checksum }) |
818 | 820 | } |
|
0 commit comments