test: use concrete type for arbitrary strategy

[mattsse]

get rid of boxed strategy

h/t @DaniPopes

[mattsse]

ffs the tuple type does not work

reth/crates/storage/db/src/tables/models/accounts.rs

Line 68 in 56dc881

pub struct BlockNumberAddress(pub (BlockNumber, Address));

...

[DaniPopes]

@mattsse the strategy is Vec<u8>'s mapped to Self

diff --git a/crates/storage/db/src/tables/utils.rs b/crates/storage/db/src/tables/utils.rs
index 93705555..7a5e9d5d 100644
--- a/crates/storage/db/src/tables/utils.rs
+++ b/crates/storage/db/src/tables/utils.rs
@@ -1,16 +1,15 @@
-//! Small database table utilities and helper functions
+//! Small database table utilities and helper functions.
+
 use crate::{
     table::{Decode, Decompress, Table},
     DatabaseError,
 };
-
 use std::borrow::Cow;
 
+/// Implements the `Arbitrary` trait for types with fixed array types.
 #[macro_export]
-/// Implements the `Arbitrary` trait for types with fixed array
-/// types.
 macro_rules! impl_fixed_arbitrary {
-    ($name:tt, $size:tt) => {
+    ($name:ident, $size:tt) => {
         #[cfg(any(test, feature = "arbitrary"))]
         use arbitrary::{Arbitrary, Unstructured};
 
@@ -19,22 +18,20 @@ macro_rules! impl_fixed_arbitrary {
             fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self, arbitrary::Error> {
                 let mut buffer = vec![0; $size];
                 u.fill_buffer(buffer.as_mut_slice())?;
-
                 Decode::decode(buffer).map_err(|_| arbitrary::Error::IncorrectFormat)
             }
         }
 
-        #[cfg(any(test, feature = "arbitrary"))]
-        use proptest::strategy::Strategy;
         #[cfg(any(test, feature = "arbitrary"))]
         impl proptest::prelude::Arbitrary for $name {
             type Parameters = ();
             type Strategy = proptest::strategy::Map<
-                proptest::collection::VecStrategy<$name>,
-                fn(<S as Strategy>::Value) -> T,
+                proptest::collection::VecStrategy<<u8 as proptest::arbitrary::Arbitrary>::Strategy>,
+                fn(Vec<u8>) -> Self,
             >;
 
             fn arbitrary_with(args: Self::Parameters) -> Self::Strategy {
+                use proptest::strategy::Strategy;
                 proptest::collection::vec(proptest::arbitrary::any_with::<u8>(args), $size)
                     .prop_map(move |vec| Decode::decode(vec).unwrap())
             }

[mattsse]

sorry but idk what this means, can't follow.

not sure how to interpret the diff

[DaniPopes]

It means I fixed it for you :)
S in S as Strategy doesn't exist, and VecStrategy<$name> should instead be VecStrategy<u8::Strategy>

[mattsse]

hehe,

tysm for this champ!

[codecov]

Codecov Report

Merging #3632 (a79d643) into main (73bfb2c) will decrease coverage by 0.02%.
The diff coverage is 0.00%.

Impacted Files	Coverage Δ
crates/storage/db/src/tables/utils.rs	81.81% <0.00%> (ø)

... and 14 files with indirect coverage changes

Flag	Coverage Δ
integration-tests	15.94% <0.00%> (-0.02%)	⬇️
unit-tests	64.11% <0.00%> (-0.02%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components	Coverage Δ
reth binary	26.40% <ø> (ø)
blockchain tree	81.25% <ø> (ø)
pipeline	86.69% <ø> (ø)
storage (db)	73.48% <0.00%> (ø)
trie	94.66% <ø> (ø)
txpool	49.11% <ø> (-0.62%)	⬇️
networking	77.87% <ø> (+<0.01%)	⬆️
rpc	58.21% <ø> (+0.13%)	⬆️
consensus	63.35% <ø> (ø)
revm	34.89% <ø> (-0.01%)	⬇️
payload builder	6.83% <ø> (ø)
primitives	88.25% <ø> (-0.02%)	⬇️