Skip to content

Commit

Permalink
Merge rust-bitcoin/rust-bitcoin#1120: Use u16::to_be_bytes
Browse files Browse the repository at this point in the history
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
  • Loading branch information
apoelstra committed Jul 25, 2022
2 parents a36dad7 + 5ca27a9 commit bd00fbb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/network/address.rs
Expand Up @@ -259,9 +259,9 @@ impl Encodable for AddrV2Message {
len += VarInt(self.services.to_u64()).consensus_encode(w)?;
len += self.addr.consensus_encode(w)?;

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

Ok(len)
}
}
Expand Down

0 comments on commit bd00fbb

Please sign in to comment.