Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: replace ruint2 with ruint #192

Merged
merged 1 commit into from
Jul 25, 2023
Merged

chore: replace ruint2 with ruint #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ itoa = "1"
once_cell = "1"
proptest = "1"
proptest-derive = "0.3"
ruint = { version = "1.9.0", package = "ruint2", default-features = false }
ruint-macro = { version = "1.0.3", package = "ruint2-macro", default-features = false }
ruint = { version = "1.9.0", default-features = false }
ruint-macro = { version = "1", default-features = false }
tiny-keccak = "2.0"
35 changes: 19 additions & 16 deletions crates/dyn-abi/src/arbitrary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
//! These implementations are guaranteed to be valid, including `CustomStruct`
//! identifiers.

// TODO: remove this after updating `ruint2`.
// TODO: Maybe make array sizes configurable? Also change parameters type from
// tuple to a struct

// `prop_oneof!` / `TupleUnion` uses `Arc`s for cheap cloning
#![allow(clippy::arc_with_non_send_sync)]

use crate::{DynSolType, DynSolValue};
Expand Down Expand Up @@ -274,7 +277,8 @@ type TypeRecurseStrategy = TupleUnion<
>;
type TypeStrategy = Rec<DynSolType, TypeRecurseStrategy>;

type ValueArrayStrategy = Flat<BoxedStrategy<DynSolValue>, VecStrategy<BoxedStrategy<DynSolValue>>>;
type ValueArrayStrategy =
Flat<BoxedStrategy<DynSolValue>, VecStrategy<SBoxedStrategy<DynSolValue>>>;

type ValueRecurseStrategy = TupleUnion<
tuple_type_cfg![
Expand Down Expand Up @@ -400,36 +404,35 @@ impl DynSolValue {
}
}

// TODO: make this `SBoxedStrategy` after updating `ruint2`.
/// Create a [proptest strategy][Strategy] to generate [`DynSolValue`]s from
/// the given type.
pub fn type_strategy(ty: &DynSolType) -> BoxedStrategy<Self> {
pub fn type_strategy(ty: &DynSolType) -> SBoxedStrategy<Self> {
match ty {
DynSolType::Bool => any::<bool>().prop_map(Self::Bool).boxed(),
DynSolType::Address => any::<Address>().prop_map(Self::Address).boxed(),
&DynSolType::Int(sz) => any::<I256>().prop_map(move |x| Self::Int(x, sz)).boxed(),
&DynSolType::Uint(sz) => any::<U256>().prop_map(move |x| Self::Uint(x, sz)).boxed(),
DynSolType::Bool => any::<bool>().prop_map(Self::Bool).sboxed(),
DynSolType::Address => any::<Address>().prop_map(Self::Address).sboxed(),
&DynSolType::Int(sz) => any::<I256>().prop_map(move |x| Self::Int(x, sz)).sboxed(),
&DynSolType::Uint(sz) => any::<U256>().prop_map(move |x| Self::Uint(x, sz)).sboxed(),
&DynSolType::FixedBytes(sz) => any::<B256>()
.prop_map(move |x| Self::FixedBytes(x, sz))
.boxed(),
DynSolType::Bytes => any::<Vec<u8>>().prop_map(Self::Bytes).boxed(),
DynSolType::String => any::<String>().prop_map(Self::String).boxed(),
.sboxed(),
DynSolType::Bytes => any::<Vec<u8>>().prop_map(Self::Bytes).sboxed(),
DynSolType::String => any::<String>().prop_map(Self::String).sboxed(),
DynSolType::Array(ty) => {
let element = Self::type_strategy(ty);
vec_strategy(element, 1..=16).prop_map(Self::Array).boxed()
vec_strategy(element, 1..=16).prop_map(Self::Array).sboxed()
}
DynSolType::FixedArray(ty, sz) => {
let element = Self::type_strategy(ty);
vec_strategy(element, *sz)
.prop_map(Self::FixedArray)
.boxed()
.sboxed()
}
DynSolType::Tuple(tys) => tys
.iter()
.map(Self::type_strategy)
.collect::<Vec<_>>()
.prop_map(Self::Tuple)
.boxed(),
.sboxed(),
#[cfg(feature = "eip712")]
DynSolType::CustomStruct { tuple, .. } => {
let types = tuple.iter().map(Self::type_strategy).collect::<Vec<_>>();
Expand All @@ -440,15 +443,15 @@ impl DynSolValue {
prop_names,
tuple,
})
.boxed()
.sboxed()
}
}
}

/// Create a [proptest strategy][Strategy] to generate [`DynSolValue`]s from
/// the given value's type.
#[inline]
pub fn value_strategy(&self) -> BoxedStrategy<Self> {
pub fn value_strategy(&self) -> SBoxedStrategy<Self> {
Self::type_strategy(&self.as_type().unwrap())
}

Expand Down