wip

Author: yancyribbens

src/lib.rs

@@ -191,12 +191,16 @@ mod tests {
 
     // TODO check about adding this to rust-bitcoins from_str for Weight
     fn parse_weight(weight: &str) -> Weight {
-        let size_parts: Vec<_> = weight.split(" ").collect();
-        let size_int = size_parts[0].parse::<u64>().unwrap();
-        match size_parts[1] {
-            "wu" => Weight::from_wu(size_int),
-            "vB" => Weight::from_vb(size_int).unwrap(),
-            _ => panic!("only support wu or vB sizes"),
+        if weight == "MAX" {
+            Weight::MAX
+        } else {
+            let size_parts: Vec<_> = weight.split(" ").collect();
+            let size_int = size_parts[0].parse::<u64>().unwrap();
+            match size_parts[1] {
+                "wu" => Weight::from_wu(size_int),
+                "vB" => Weight::from_vb(size_int).unwrap(),
+                _ => panic!("only support wu or vB sizes"),
+            }
         }
     }
 
@@ -230,6 +234,7 @@ mod tests {
             match self.weight.to_wu() {
                 230 => InputWeightPrediction::P2TR_KEY_DEFAULT_SIGHASH,
                 272 => InputWeightPrediction::P2WPKH_MAX,
+                18446744073709551615 => InputWeightPrediction::from_slice((usize::MAX / 4) - 49, &[1]),
                 _ => panic!("unknown input weight: {:?}", self.weight),
             }
         }

src/single_random_draw.rs

@@ -48,6 +48,7 @@ pub fn select_coins_srd<'a, R: rand::Rng + ?Sized, Utxo: WeightedUtxo>(
     let mut value = Amount::ZERO;
 
     let mut iteration = 0;
+
     for w_utxo in origin {
         iteration += 1;
         let effective_value = w_utxo.effective_value(fee_rate);
@@ -248,17 +249,18 @@ mod tests {
         .assert();
     }
 
-    //#[test]
-    //fn select_coins_srd_addition_overflow() {
-        //TestSRD {
-            //target: "2 cBTC",
-            //fee_rate: "10 sat/kwu",
-            //weighted_utxos: &["1 cBTC/18446744073709551615 wu"], // weight= u64::MAX
-            //expected_utxos: None,
-            //expected_iterations: 0,
-        //}
-        //.assert();
-    //}
+    #[test]
+    fn select_coins_srd_addition_overflow() {
+        // Overflow when effective_value is computed with MAX weight.
+        TestSRD {
+            target: "2 cBTC",
+            fee_rate: "10 sat/kwu",
+            weighted_utxos: &["1 cBTC/MAX"],
+            expected_utxos: None,
+            expected_iterations: 0,
+        }
+        .assert();
+    }
 
     #[test]
     fn select_coins_srd_threshold_overflow() {
@@ -272,24 +274,28 @@ mod tests {
         .assert();
     }
 
-    //#[test]
-    //fn select_coins_srd_pool_overflow() {
-        //TestSRD {
-            //target: "18315535.91666658 BTC",
-            //fee_rate: "0",
-            //weighted_utxos: &[
-                //"e(1550078614956004 sats)/68 vB",
-                //"e(1831540706090689 sats)/18446744073692774400 wu",
-                //"e(12885625970 sats)/68 vB",
-            //],
-            //expected_utxos: Some(&[
-                //"e(1831540706090689 sats)/18446744073692774400 wu",
-                //"e(12885625970 sats)/68 vB",
-            //]),
-            //expected_iterations: 2,
-        //}
-        //.assert();
-    //}
+    #[test]
+    fn select_coins_srd_pool_overflow() {
+        // Adding the first utxo to the second overflows.
+        // The test shows that the second UTXO is then skipped
+        // due to overflow and the next one is still selected.
+
+        TestSRD {
+            target: "18315535.91666658 BTC",
+            fee_rate: "0",
+            weighted_utxos: &[
+                "e(1550078614956004 sats)/68 vB",
+                "e(1831540706090689 sats)/68 vB",
+                "e(12885625970 sats)/68 vB",
+            ],
+            expected_utxos: Some(&[
+                "e(1831540706090689 sats)/68 vB",
+                "e(12885625970 sats)/68 vB",
+            ]),
+            expected_iterations: 2,
+        }
+        .assert();
+    }
 
     //#[test]
     //fn select_srd_match_proptest() {