Skip to content

Commit bd00fbb

Browse files
committed
Merge rust-bitcoin/rust-bitcoin#1120: Use u16::to_be_bytes
3c28694 Use to_be_bytes (Tobin C. Harding) Pull request description: Now that MSRV is > 1.32 we can use `u16::to_be_bytes` to ensure network byte order when encoding the port number of a `AddrV2Message`. Remove the TODO and use `to_be_bytes` as suggested. ACKs for top commit: Kixunil: ACK 3c28694 apoelstra: ACK 3c28694 Tree-SHA512: b5dd9b0f43257f84defb9e9ecf9d02469f1959669367c5ad02cfb43003b780cf07ea344579b52a75c424fd85f8fa02dee3713b967c9b3a33eec6b7aa914763cd
2 parents a36dad7 + 5ca27a9 commit bd00fbb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/network/address.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,9 @@ impl Encodable for AddrV2Message {
259259
len += VarInt(self.services.to_u64()).consensus_encode(w)?;
260260
len += self.addr.consensus_encode(w)?;
261261

262-
// consensus_encode always encodes in LE, and we want to encode in BE.
263-
//TODO `len += io::Write::write(w, &self.port.to_be_bytes())?;` when MSRV >= 1.32
264-
len += self.port.swap_bytes().consensus_encode(w)?;
262+
w.write_all(&self.port.to_be_bytes())?;
263+
len += 2; // port u16 is two bytes.
264+
265265
Ok(len)
266266
}
267267
}

0 commit comments

Comments
 (0)