Move locktime and sequence code to units

Move the `sequence` module and the code from both locktime modules
from `primitives` to `units`.

Author: tcharding

bitcoin/src/blockdata/mod.rs

@@ -39,9 +39,9 @@ pub mod locktime {
 
         pub use crate::consensus::encode::{self, Decodable, Encodable};
 
-        /// Re-export everything from the `primitives::locktime::absolute` module.
+        /// Re-export everything from the `units::locktime::absolute` module.
         #[rustfmt::skip]        // Keep public re-exports separate.
-        pub use primitives::locktime::absolute::{ConversionError, Height, LockTime, ParseHeightError, ParseTimeError, MedianTimePast};
+        pub use units::locktime::absolute::{ConversionError, Height, LockTime, ParseHeightError, ParseTimeError, MedianTimePast};
 
         #[deprecated(since = "TBD", note = "use `MedianTimePast` instead")]
         #[doc(hidden)]
@@ -69,8 +69,8 @@ pub mod locktime {
         //! There are two types of lock time: lock-by-height and lock-by-time, distinguished by
         //! whether bit 22 of the `u32` consensus value is set.
 
-        /// Re-export everything from the `primitives::locktime::relative` module.
-        pub use primitives::locktime::relative::{
+        /// Re-export everything from the `units::locktime::relative` module.
+        pub use units::locktime::relative::{
             DisabledLockTimeError, InvalidHeightError, InvalidTimeError, LockTime,
             NumberOf512Seconds, NumberOfBlocks, TimeOverflowError,
         };

primitives/src/lib.rs

@@ -38,13 +38,11 @@ pub mod _export {
 }
 
 pub mod block;
-pub mod locktime;
 pub mod merkle_tree;
 mod opcodes;
 pub mod pow;
 #[cfg(feature = "alloc")]
 pub mod script;
-pub mod sequence;
 pub mod transaction;
 #[cfg(feature = "alloc")]
 pub mod witness;
@@ -54,6 +52,8 @@ pub use units::{
     amount::{self, Amount, SignedAmount},
     block::{BlockHeight, BlockHeightInterval, BlockMtp, BlockMtpInterval},
     fee_rate::{self, FeeRate},
+    locktime::{self, absolute, relative},
+    sequence::{self, Sequence},
     time::{self, BlockTime},
     weight::{self, Weight},
 };
@@ -75,10 +75,8 @@ pub use self::{
 #[doc(inline)]
 pub use self::{
     block::{BlockHash, Header as BlockHeader, Version as BlockVersion, WitnessCommitment},
-    locktime::{absolute, relative},
     merkle_tree::{TxMerkleNode, WitnessMerkleNode},
     pow::CompactTarget,
-    sequence::Sequence,
     transaction::{OutPoint, Txid, Version as TransactionVersion, Wtxid},
 };