test: Upgrade rand and proptest

Author: evanlinjin

Cargo.toml

@@ -21,6 +21,6 @@ default = ["std"]
 std = []
 
 [dev-dependencies]
-rand = "0.8"
-proptest = "1.4"
+rand = "0.9"
+proptest = "1.7"
 bitcoin = "0.32"

tests/bnb.rs

@@ -10,12 +10,12 @@ use proptest::{prelude::*, proptest, test_runner::*};
 
 fn test_wv(mut rng: impl RngCore) -> impl Iterator<Item = Candidate> {
     core::iter::repeat_with(move || {
-        let value = rng.gen_range(0..1_000);
+        let value = rng.random_range(0..1_000);
         let mut candidate = Candidate {
             value,
             weight: 100,
-            input_count: rng.gen_range(1..2),
-            is_segwit: rng.gen_bool(0.5),
+            input_count: rng.random_range(1..2),
+            is_segwit: rng.random_bool(0.5),
         };
         // HACK: set is_segwit = true for all these tests because you can't actually lower bound
         // things easily with how segwit inputs interfere with their weights. We can't modify the
@@ -100,7 +100,7 @@ fn bnb_finds_an_exact_solution_in_n_iter() {
         .last()
         .expect("it found a solution");
 
-    assert_eq!(rounds, 3150);
+    assert_eq!(rounds, 3194);
     assert_eq!(best.input_weight(), solution_weight);
     assert_eq!(best.selected_value(), target_value, "score={:?}", score);
 }
@@ -134,9 +134,9 @@ fn bnb_finds_solution_if_possible_in_n_iter() {
         .last()
         .expect("found a solution");
 
-    assert_eq!(rounds, 193);
+    assert_eq!(rounds, 164);
     let excess = sol.excess(target, Drain::NONE);
-    assert_eq!(excess, 1);
+    assert_eq!(excess, 0);
 }
 
 proptest! {

tests/changeless.rs

@@ -11,11 +11,11 @@ use rand::{prelude::IteratorRandom, Rng, RngCore};
 
 fn test_wv(mut rng: impl RngCore) -> impl Iterator<Item = Candidate> {
     core::iter::repeat_with(move || {
-        let value = rng.gen_range(0..1_000);
+        let value = rng.random_range(0..1_000);
         Candidate {
             value,
-            weight: rng.gen_range(0..100),
-            input_count: rng.gen_range(1..2),
+            weight: rng.random_range(0..100),
+            input_count: rng.random_range(1..2),
             is_segwit: false,
         }
     })

tests/common.rs

@@ -243,10 +243,10 @@ impl StrategyParams {
 pub fn gen_candidates(n: usize) -> Vec<Candidate> {
     let mut rng = TestRng::deterministic_rng(RngAlgorithm::ChaCha);
     core::iter::repeat_with(move || {
-        let value = rng.gen_range(1..500_001);
-        let weight = rng.gen_range(1..2001);
-        let input_count = rng.gen_range(1..3);
-        let is_segwit = rng.gen_bool(0.01);
+        let value = rng.random_range(1..500_001);
+        let weight = rng.random_range(1..2001);
+        let input_count = rng.random_range(1..3);
+        let is_segwit = rng.random_bool(0.01);
 
         Candidate {
             value,
@@ -465,11 +465,11 @@ pub fn compare_against_benchmarks<M: BnbMetric + Clone>(
 }
 
 #[allow(unused)]
-fn randomly_satisfy_target<'a>(
+fn randomly_satisfy_target<'a, R: rand::Rng>(
     cs: &CoinSelector<'a>,
     target: Target,
     change_policy: ChangePolicy,
-    rng: &mut impl RngCore,
+    rng: &mut R,
     mut metric: impl BnbMetric,
 ) -> CoinSelector<'a> {
     let mut cs = cs.clone();