11use quickcheck:: Gen ;
22use rand:: {
3- distributions :: { weighted:: WeightedIndex , Distribution } ,
3+ distr :: { weighted:: WeightedIndex , Distribution } ,
44 Rng , RngCore , SeedableRng ,
55} ;
66
@@ -16,19 +16,19 @@ impl<const S: usize> quickcheck::Arbitrary for Multihash<S> {
1616 let dist = WeightedIndex :: new ( weights. iter ( ) ) . unwrap ( ) ;
1717 let mut rng = rand:: rngs:: SmallRng :: seed_from_u64 ( u64:: arbitrary ( g) ) ;
1818 let code = match dist. sample ( & mut rng) {
19- 0 => rng. gen_range ( 0 ..u64:: pow ( 2 , 7 ) ) ,
20- 1 => rng. gen_range ( u64:: pow ( 2 , 7 ) ..u64:: pow ( 2 , 14 ) ) ,
21- 2 => rng. gen_range ( u64:: pow ( 2 , 14 ) ..u64:: pow ( 2 , 21 ) ) ,
22- 3 => rng. gen_range ( u64:: pow ( 2 , 21 ) ..u64:: pow ( 2 , 28 ) ) ,
23- 4 => rng. gen_range ( u64:: pow ( 2 , 28 ) ..u64:: pow ( 2 , 35 ) ) ,
24- 5 => rng. gen_range ( u64:: pow ( 2 , 35 ) ..u64:: pow ( 2 , 42 ) ) ,
25- 6 => rng. gen_range ( u64:: pow ( 2 , 42 ) ..u64:: pow ( 2 , 49 ) ) ,
26- 7 => rng. gen_range ( u64:: pow ( 2 , 56 ) ..u64:: pow ( 2 , 63 ) ) ,
19+ 0 => rng. random_range ( 0 ..u64:: pow ( 2 , 7 ) ) ,
20+ 1 => rng. random_range ( u64:: pow ( 2 , 7 ) ..u64:: pow ( 2 , 14 ) ) ,
21+ 2 => rng. random_range ( u64:: pow ( 2 , 14 ) ..u64:: pow ( 2 , 21 ) ) ,
22+ 3 => rng. random_range ( u64:: pow ( 2 , 21 ) ..u64:: pow ( 2 , 28 ) ) ,
23+ 4 => rng. random_range ( u64:: pow ( 2 , 28 ) ..u64:: pow ( 2 , 35 ) ) ,
24+ 5 => rng. random_range ( u64:: pow ( 2 , 35 ) ..u64:: pow ( 2 , 42 ) ) ,
25+ 6 => rng. random_range ( u64:: pow ( 2 , 42 ) ..u64:: pow ( 2 , 49 ) ) ,
26+ 7 => rng. random_range ( u64:: pow ( 2 , 56 ) ..u64:: pow ( 2 , 63 ) ) ,
2727 _ => unreachable ! ( ) ,
2828 } ;
2929
3030 // Maximum size is S byte due to the generic.
31- let size = rng. gen_range ( 0 ..S ) ;
31+ let size = rng. random_range ( 0 ..S ) ;
3232 let mut data = [ 0 ; S ] ;
3333 rng. fill_bytes ( & mut data) ;
3434 Multihash :: wrap ( code, & data[ ..size] ) . unwrap ( )
0 commit comments