refactor(chain): replace unix epoch u64 with bitcoin::absolute::Time

notmandatory · Mar 13, 2024 · 9ecc497 · 9ecc497
1 parent c01983d
commit 9ecc497
Show file tree

Hide file tree

Showing 19 changed files with 377 additions and 137 deletions.
diff --git a/crates/bdk/src/wallet/coin_selection.rs b/crates/bdk/src/wallet/coin_selection.rs
@@ -738,6 +738,7 @@ mod test {
     use core::str::FromStr;
 
     use bdk_chain::ConfirmationTime;
+    use bitcoin::absolute::{Time, LOCK_TIME_THRESHOLD};
     use bitcoin::{OutPoint, ScriptBuf, TxOut};
 
     use super::*;
@@ -780,13 +781,27 @@ mod test {
 
     fn get_test_utxos() -> Vec<WeightedUtxo> {
         vec![
-            utxo(100_000, 0, ConfirmationTime::Unconfirmed { last_seen: 0 }),
+            utxo(
+                100_000,
+                0,
+                ConfirmationTime::Unconfirmed {
+                    last_seen: Time::MIN,
+                },
+            ),
             utxo(
                 FEE_AMOUNT - 40,
                 1,
-                ConfirmationTime::Unconfirmed { last_seen: 0 },
+                ConfirmationTime::Unconfirmed {
+                    last_seen: Time::MIN,
+                },
+            ),
+            utxo(
+                200_000,
+                2,
+                ConfirmationTime::Unconfirmed {
+                    last_seen: Time::MIN,
+                },
             ),
-            utxo(200_000, 2, ConfirmationTime::Unconfirmed { last_seen: 0 }),
         ]
     }
 
@@ -797,23 +812,23 @@ mod test {
             1,
             ConfirmationTime::Confirmed {
                 height: 1,
-                time: 1231006505,
+                time: Time::from_consensus(1231006505).unwrap(),
             },
         );
         let utxo2 = utxo(
             80_000,
             2,
             ConfirmationTime::Confirmed {
                 height: 2,
-                time: 1231006505,
+                time: Time::from_consensus(1231006505).unwrap(),
             },
         );
         let utxo3 = utxo(
             300_000,
             3,
             ConfirmationTime::Confirmed {
                 height: 3,
-                time: 1231006505,
+                time: Time::from_consensus(1231006505).unwrap(),
             },
         );
         vec![utxo1, utxo2, utxo3]
@@ -822,6 +837,8 @@ mod test {
     fn generate_random_utxos(rng: &mut StdRng, utxos_number: usize) -> Vec<WeightedUtxo> {
         let mut res = Vec::new();
         for i in 0..utxos_number {
+            let random_time =
+                Time::from_consensus(rng.gen_range(LOCK_TIME_THRESHOLD..=u32::MAX)).unwrap();
             res.push(WeightedUtxo {
                 satisfaction_weight: P2WPKH_SATISFACTION_SIZE,
                 utxo: Utxo::Local(LocalOutput {
@@ -840,10 +857,12 @@ mod test {
                     confirmation_time: if rng.gen_bool(0.5) {
                         ConfirmationTime::Confirmed {
                             height: rng.next_u32(),
-                            time: rng.next_u64(),
+                            time: random_time,
                         }
                     } else {
-                        ConfirmationTime::Unconfirmed { last_seen: 0 }
+                        ConfirmationTime::Unconfirmed {
+                            last_seen: Time::MIN,
+                        }
                     },
                 }),
             });
@@ -868,7 +887,9 @@ mod test {
                     keychain: KeychainKind::External,
                     is_spent: false,
                     derivation_index: 42,
-                    confirmation_time: ConfirmationTime::Unconfirmed { last_seen: 0 },
+                    confirmation_time: ConfirmationTime::Unconfirmed {
+                        last_seen: Time::MIN,
+                    },
                 }),
             })
             .collect()
@@ -1159,7 +1180,9 @@ mod test {
         optional.push(utxo(
             500_000,
             3,
-            ConfirmationTime::Unconfirmed { last_seen: 0 },
+            ConfirmationTime::Unconfirmed {
+                last_seen: Time::MIN,
+            },
         ));
 
         // Defensive assertions, for sanity and in case someone changes the test utxos vector.
@@ -1520,7 +1543,7 @@ mod test {
                     derivation_index: 0,
                     confirmation_time: ConfirmationTime::Confirmed {
                         height: 12345,
-                        time: 12345,
+                        time: Time::from_consensus(LOCK_TIME_THRESHOLD + 12345).unwrap(),
                     },
                 }),
             }

diff --git a/crates/bdk/src/wallet/export.rs b/crates/bdk/src/wallet/export.rs
@@ -215,6 +215,7 @@ mod test {
     use core::str::FromStr;
 
     use bdk_chain::{BlockId, ConfirmationTime};
+    use bitcoin::absolute::Time;
     use bitcoin::hashes::Hash;
     use bitcoin::{BlockHash, Network, Transaction};
 
@@ -244,7 +245,7 @@ mod test {
                 transaction,
                 ConfirmationTime::Confirmed {
                     height: 5000,
-                    time: 0,
+                    time: Time::MIN,
                 },
             )
             .unwrap();

diff --git a/crates/bdk/src/wallet/mod.rs b/crates/bdk/src/wallet/mod.rs
@@ -2479,7 +2479,7 @@ impl<D> Wallet<D> {
     /// `last_seen` is prioritized.
     pub fn apply_unconfirmed_txs<'t>(
         &mut self,
-        unconfirmed_txs: impl IntoIterator<Item = (&'t Transaction, u64)>,
+        unconfirmed_txs: impl IntoIterator<Item = (&'t Transaction, absolute::Time)>,
     ) where
         D: PersistBackend<ChangeSet>,
     {

diff --git a/crates/bdk/src/wallet/tx_builder.rs b/crates/bdk/src/wallet/tx_builder.rs
@@ -931,6 +931,7 @@ mod test {
     }
 
     use bdk_chain::ConfirmationTime;
+    use bitcoin::absolute::{Time, LOCK_TIME_THRESHOLD};
     use bitcoin::consensus::deserialize;
     use bitcoin::hashes::hex::FromHex;
 
@@ -1023,7 +1024,9 @@ mod test {
                 txout: Default::default(),
                 keychain: KeychainKind::External,
                 is_spent: false,
-                confirmation_time: ConfirmationTime::Unconfirmed { last_seen: 0 },
+                confirmation_time: ConfirmationTime::Unconfirmed {
+                    last_seen: Time::MIN,
+                },
                 derivation_index: 0,
             },
             LocalOutput {
@@ -1036,7 +1039,7 @@ mod test {
                 is_spent: false,
                 confirmation_time: ConfirmationTime::Confirmed {
                     height: 32,
-                    time: 42,
+                    time: Time::from_consensus(LOCK_TIME_THRESHOLD + 42).unwrap(),
                 },
                 derivation_index: 1,
             },

diff --git a/crates/bdk/tests/common.rs b/crates/bdk/tests/common.rs
@@ -3,6 +3,7 @@
 use bdk::{wallet::AddressIndex, KeychainKind, LocalOutput, Wallet};
 use bdk_chain::indexed_tx_graph::Indexer;
 use bdk_chain::{BlockId, ConfirmationTime};
+use bitcoin::absolute::{Time, LOCK_TIME_THRESHOLD};
 use bitcoin::hashes::Hash;
 use bitcoin::{Address, BlockHash, Network, OutPoint, Transaction, TxIn, TxOut, Txid};
 use std::str::FromStr;
@@ -82,7 +83,7 @@ pub fn get_funded_wallet_with_change(
             tx0,
             ConfirmationTime::Confirmed {
                 height: 1_000,
-                time: 100,
+                time: Time::from_consensus(LOCK_TIME_THRESHOLD + 100).unwrap(),
             },
         )
         .unwrap();
@@ -91,7 +92,7 @@ pub fn get_funded_wallet_with_change(
             tx1.clone(),
             ConfirmationTime::Confirmed {
                 height: 2_000,
-                time: 200,
+                time: Time::from_consensus(LOCK_TIME_THRESHOLD + 200).unwrap(),
             },
         )
         .unwrap();