Merge rust-bitcoin#4589: Move bitcoin::p2p into p2p

d9cf727 Move `bitcoin/p2p` into `p2p` (rustaceanrob)

Pull request description:

  Could use a rebase on rust-bitcoin#4568

  Somehow lost the branch of my original draft so some of the review context is removed, but all comments were addressed in separate PRs.

  First commit moves everything required to implement encoding within `p2p`, so we have a reference for functions to add to future moves to `internals`. Second commit does the relocation and third commit removes the `bitcoin/p2p` module.

ACKs for top commit:
  apoelstra:
    ACK d9cf727; successfully ran local tests
  tcharding:
    ACK d9cf727

Tree-SHA512: 31bf960788f45bb60b04dd73793a06828a5540e1e6118376776494bad9330dc8ebcb57749bc84b70a00e4d1d2a5686506e089269833ed99c4f9fa0c3e3b2e5b7

Author: apoelstra

Cargo-minimal.lock

@@ -77,6 +77,7 @@ name = "bitcoin-fuzz"
 version = "0.0.1"
 dependencies = [
  "bitcoin",
+ "bitcoin-p2p-messages",
  "honggfuzz",
  "serde",
  "serde_json",
@@ -109,6 +110,15 @@ dependencies = [
 [[package]]
 name = "bitcoin-p2p-messages"
 version = "0.1.0"
+dependencies = [
+ "bitcoin",
+ "bitcoin-internals",
+ "bitcoin-io 0.2.0",
+ "bitcoin-units",
+ "bitcoin_hashes 0.16.0",
+ "hex-conservative 0.3.0",
+ "hex_lit",
+]
 
 [[package]]
 name = "bitcoin-primitives"

Cargo-recent.lock

@@ -76,6 +76,7 @@ name = "bitcoin-fuzz"
 version = "0.0.1"
 dependencies = [
  "bitcoin",
+ "bitcoin-p2p-messages",
  "honggfuzz",
  "serde",
  "serde_json",
@@ -108,6 +109,15 @@ dependencies = [
 [[package]]
 name = "bitcoin-p2p-messages"
 version = "0.1.0"
+dependencies = [
+ "bitcoin",
+ "bitcoin-internals",
+ "bitcoin-io 0.2.0",
+ "bitcoin-units",
+ "bitcoin_hashes 0.16.0",
+ "hex-conservative 0.3.0",
+ "hex_lit",
+]
 
 [[package]]
 name = "bitcoin-primitives"

bitcoin/Cargo.toml

@@ -56,10 +56,6 @@ rustdoc-args = ["--cfg", "docsrs"]
 [[example]]
 name = "bip32"
 
-[[example]]
-name = "handshake"
-required-features = ["rand-std"]
-
 [[example]]
 name = "ecdsa-psbt"
 required-features = ["std", "bitcoinconsensus"]

bitcoin/src/lib.rs

@@ -94,7 +94,6 @@ extern crate serde;
 mod internal_macros;
 
 #[macro_use]
-pub mod p2p;
 pub mod address;
 pub mod bip152;
 pub mod bip158;