Depend on primitives instead of bitcoin where type definitions overlap

Consolidate dependency tree for downstream crates that depend on
`bitcoin-p2p-messages` and `bitcoin-primitives` by reducing overlapping
dependencies.  For example, consider crate A which depends on
`bitcoin-primitives` and `bitcoin-p2p-messages`.  For types defined by
both `bitcoin-primitives` and `bitcoin`, Crate A may still need to
depend on `bitcoin` if a type of `bitcoin-p2p-messages` depends on
`bitcoin` instead of `bitcoin-primitives`.

Author: yancyribbens

Cargo-minimal.lock

@@ -130,6 +130,7 @@ dependencies = [
  "bitcoin-consensus-encoding",
  "bitcoin-internals",
  "bitcoin-io",
+ "bitcoin-primitives",
  "bitcoin-units",
  "bitcoin_hashes",
  "hex-conservative 0.3.0",

Cargo-recent.lock

@@ -129,6 +129,7 @@ dependencies = [
  "bitcoin-consensus-encoding",
  "bitcoin-internals",
  "bitcoin-io",
+ "bitcoin-primitives",
  "bitcoin-units",
  "bitcoin_hashes",
  "hex-conservative 0.3.0",

p2p/Cargo.toml

@@ -14,13 +14,14 @@ exclude = ["tests", "contrib"]
 
 [features]
 default = ["std"]
-std = ["encoding/std", "hashes/std", "hex/std", "internals/std", "io/std", "units/std", "bitcoin/std"]
+std = ["encoding/std", "hashes/std", "hex/std", "internals/std", "io/std", "units/std", "bitcoin/std", "primitives/std"]
 arbitrary = ["dep:arbitrary", "bitcoin/arbitrary"]
 
 [dependencies]
 bitcoin = { path = "../bitcoin/", default-features = false }
 encoding = { package = "bitcoin-consensus-encoding", version = "=1.0.0-rc.2", path = "../consensus_encoding", default-features = false }
 hashes = { package = "bitcoin_hashes", version = "0.18.0", path = "../hashes", default-features = false }
+primitives = { package = "bitcoin-primitives", path = "../primitives", version = "=1.0.0-rc.1", default-features = false }
 hex = { package = "hex-conservative", version = "0.3.0", default-features = false }
 internals = { package = "bitcoin-internals", path = "../internals", default-features = false }
 io = { package = "bitcoin-io", path = "../io", default-features = false }

p2p/src/message.rs

@@ -16,7 +16,7 @@ use core::{cmp, fmt};
 use arbitrary::{Arbitrary, Unstructured};
 use bitcoin::consensus::encode::{self, Decodable, Encodable, ReadExt, WriteExt};
 use bitcoin::merkle_tree::MerkleBlock;
-use bitcoin::{block, transaction};
+use primitives::{block, transaction};
 use encoding;
 use hashes::sha256d;
 use internals::ToU64 as _;
@@ -1657,9 +1657,9 @@ mod test {
     use alloc::vec;
     use std::net::Ipv4Addr;
 
-    use bitcoin::block::{Block, BlockHash};
+    use primitives::{Block, BlockHash};
     use bitcoin::consensus::encode::{deserialize, deserialize_partial, serialize};
-    use bitcoin::transaction::{Transaction, Txid};
+    use primitives::transaction::{Transaction, Txid};
     use hex_lit::hex;
     use units::BlockHeight;
 

p2p/src/message_blockdata.rs

@@ -9,9 +9,9 @@ use alloc::vec::Vec;
 
 #[cfg(feature = "arbitrary")]
 use arbitrary::{Arbitrary, Unstructured};
-use bitcoin::block::BlockHash;
+use primitives::BlockHash;
 use bitcoin::consensus::encode::{self, Decodable, Encodable};
-use bitcoin::transaction::{Txid, Wtxid};
+use primitives::transaction::{Txid, Wtxid};
 use io::{BufRead, Write};
 
 use crate::consensus::impl_consensus_encoding;

p2p/src/message_filter.rs

@@ -8,7 +8,7 @@ use alloc::vec::Vec;
 
 #[cfg(feature = "arbitrary")]
 use arbitrary::{Arbitrary, Unstructured};
-use bitcoin::block::BlockHash;
+use primitives::BlockHash;
 use hashes::{sha256d, HashEngine};
 use units::BlockHeight;