Add actual-arbitrary dependency

The actual-arbitrary dependency groups two features, arbitrary and
units/arbitrary in the bitcoin crate.  Similar functionality can be
achieved using the `dep:` syntax, however that violates the crates
current MSRV.

Author: yancyribbens

bitcoin/Cargo.toml

@@ -22,7 +22,7 @@ serde = ["actual-serde", "hashes/serde", "secp256k1/serde", "internals/serde", "
 secp-lowmemory = ["secp256k1/lowmemory"]
 secp-recovery = ["secp256k1/recovery"]
 bitcoinconsensus-std = ["bitcoinconsensus/std", "std"]
-arbitrary-units = ["units/arbitrary"]
+arbitrary = ["actual-arbitrary", "units/arbitrary"]
 
 [package.metadata.docs.rs]
 all-features = true
@@ -46,7 +46,9 @@ bitcoinconsensus = { version = "0.105.0+25.1", default-features = false, optiona
 
 # Do NOT use this as a feature! Use the `serde` feature instead.
 actual-serde = { package = "serde", version = "1.0.103", default-features = false, features = [ "derive", "alloc" ], optional = true }
-arbitrary = { version = "1.0.1", optional = true }
+
+# Do NOT use this as a feature! Use the `arbitrary` feature instead.
+actual-arbitrary = { package = "arbitrary", version = "1.0.1", optional = true }
 
 [dev-dependencies]
 serde_json = "1.0.0"

bitcoin/src/bip152.rs

@@ -10,7 +10,7 @@ use core::{convert, fmt, mem};
 use std::error;
 
 #[cfg(feature = "arbitrary")]
-use arbitrary::{Arbitrary, Unstructured};
+use actual_arbitrary::{self as arbitrary, Arbitrary, Unstructured};
 use hashes::{sha256, siphash24, Hash};
 use internals::impl_array_newtype;
 use io::{Read, Write};

bitcoin/src/bip158.rs

@@ -42,7 +42,7 @@ use core::cmp::{self, Ordering};
 use core::fmt::{self, Display, Formatter};
 
 #[cfg(feature = "arbitrary")]
-use arbitrary::{Arbitrary, Unstructured};
+use actual_arbitrary::{self as arbitrary, Arbitrary, Unstructured};
 use hashes::{sha256d, siphash24, Hash};
 use internals::write_err;
 use io::{Read, Write};

bitcoin/src/blockdata/block.rs

@@ -11,7 +11,7 @@
 use core::fmt;
 
 #[cfg(feature = "arbitrary")]
-use arbitrary::{Arbitrary, Unstructured};
+use actual_arbitrary::{self as arbitrary, Arbitrary, Unstructured};
 use hashes::{sha256d, Hash, HashEngine};
 use io::{Read, Write};
 

bitcoin/src/blockdata/locktime/absolute.rs

@@ -11,7 +11,7 @@ use core::fmt;
 use core::str::FromStr;
 
 #[cfg(feature = "arbitrary")]
-use arbitrary::{Arbitrary, Unstructured};
+use actual_arbitrary::{self as arbitrary, Arbitrary, Unstructured};
 use io::{Read, Write};
 #[cfg(all(test, mutate))]
 use mutagen::mutate;

bitcoin/src/blockdata/script/owned.rs

@@ -4,7 +4,7 @@
 use core::ops::Deref;
 
 #[cfg(feature = "arbitrary")]
-use arbitrary::{Arbitrary, Unstructured};
+use actual_arbitrary::{self as arbitrary, Arbitrary, Unstructured};
 use hex::FromHex;
 use secp256k1::{Secp256k1, Verification};
 

bitcoin/src/blockdata/transaction.rs

@@ -39,7 +39,7 @@ use crate::{Amount, SignedAmount, VarInt};
 pub use crate::consensus::validation::TxVerifyError;
 
 #[cfg(feature = "arbitrary")]
-use arbitrary::{Arbitrary, Unstructured};
+use actual_arbitrary::{self as arbitrary, Arbitrary, Unstructured};
 
 hashes::hash_newtype! {
     /// A bitcoin transaction hash/transaction ID.

bitcoin/src/blockdata/witness.rs

@@ -9,7 +9,7 @@ use core::fmt;
 use core::ops::Index;
 
 #[cfg(feature = "arbitrary")]
-use arbitrary::{Arbitrary, Unstructured};
+use actual_arbitrary::{self as arbitrary, Arbitrary, Unstructured};
 use io::{Read, Write};
 
 use crate::consensus::encode::{Error, MAX_VEC_SIZE};

bitcoin/src/crypto/ecdsa.rs

@@ -8,7 +8,7 @@ use core::str::FromStr;
 use core::{fmt, iter};
 
 #[cfg(feature = "arbitrary")]
-use arbitrary::{Arbitrary, Unstructured};
+use actual_arbitrary::{self as arbitrary, Arbitrary, Unstructured};
 use hex::FromHex;
 use internals::write_err;
 use io::Write;

bitcoin/src/crypto/sighash.rs

@@ -14,7 +14,7 @@
 use core::{fmt, str};
 
 #[cfg(feature = "arbitrary")]
-use arbitrary::{Arbitrary, Unstructured};
+use actual_arbitrary::{self as arbitrary, Arbitrary, Unstructured};
 use hashes::{hash_newtype, sha256, sha256d, sha256t_hash_newtype, Hash};
 use internals::write_err;
 use io::Write;