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(builder): add unit tests to bundle_sender #735

Merged
merged 1 commit into from
Jun 20, 2024
+741 −70
Merged

chore(builder): add unit tests to bundle_sender #735

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
111 changes: 110 additions & 1 deletion crates/builder/src/bundle_proposer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ impl<UO: UserOperation> Bundle<UO> {
}
}

#[cfg_attr(test, automock(type UO = rundler_types::v0_6::UserOperation;))]
#[async_trait]
#[cfg_attr(test, automock(type UO = rundler_types::v0_6::UserOperation;))]
pub(crate) trait BundleProposer: Send + Sync + 'static {
type UO: UserOperation;

Expand Down Expand Up @@ -1579,6 +1579,8 @@ mod tests {
vec![],
base_fee,
max_priority_fee_per_gas,
false,
ExpectedStorage::default(),
)
.await;
assert_eq!(
Expand Down Expand Up @@ -1613,6 +1615,8 @@ mod tests {
vec![],
base_fee,
max_priority_fee_per_gas,
false,
ExpectedStorage::default(),
)
.await;
assert_eq!(
Expand Down Expand Up @@ -1655,6 +1659,8 @@ mod tests {
vec![],
base_fee,
max_priority_fee_per_gas,
false,
ExpectedStorage::default(),
)
.await;
assert_eq!(
Expand Down Expand Up @@ -1746,6 +1752,8 @@ mod tests {
vec![],
U256::zero(),
U256::zero(),
false,
ExpectedStorage::default(),
)
.await;
// Ops should be grouped by aggregator. Further, the `signature` field
Expand Down Expand Up @@ -1834,6 +1842,8 @@ mod tests {
vec![deposit, deposit, deposit],
U256::zero(),
U256::zero(),
false,
ExpectedStorage::default(),
)
.await;

Expand Down Expand Up @@ -1895,6 +1905,8 @@ mod tests {
vec![deposit, deposit, deposit],
U256::zero(),
U256::zero(),
false,
ExpectedStorage::default(),
)
.await;

Expand Down Expand Up @@ -2024,6 +2036,8 @@ mod tests {
vec![],
U256::zero(),
U256::zero(),
false,
ExpectedStorage::default(),
)
.await;

Expand Down Expand Up @@ -2056,6 +2070,8 @@ mod tests {
vec![],
U256::zero(),
U256::zero(),
false,
ExpectedStorage::default(),
)
.await;

Expand Down Expand Up @@ -2122,6 +2138,8 @@ mod tests {
vec![],
U256::zero(),
U256::zero(),
false,
ExpectedStorage::default(),
)
.await;

Expand All @@ -2138,6 +2156,76 @@ mod tests {
);
}

#[tokio::test]
async fn test_condition_not_met_match() {
let op = default_op();

let mut expected_storage = ExpectedStorage::default();
expected_storage.insert(address(1), U256::zero(), U256::zero());
let actual_storage = expected_storage.clone();

let bundle = mock_make_bundle(
vec![MockOp {
op: op.clone(),
simulation_result: Box::new(move || {
Ok(SimulationResult {
expected_storage: expected_storage.clone(),
..Default::default()
})
}),
}],
vec![],
vec![HandleOpsOut::Success],
vec![],
U256::zero(),
U256::zero(),
true,
actual_storage,
)
.await;

assert_eq!(
bundle.ops_per_aggregator,
vec![UserOpsPerAggregator {
user_ops: vec![op],
..Default::default()
}]
);
}

#[tokio::test]
async fn test_condition_not_met_mismatch() {
let op = default_op();

let mut expected_storage = ExpectedStorage::default();
expected_storage.insert(address(1), U256::zero(), U256::zero());
let mut actual_storage = ExpectedStorage::default();
actual_storage.insert(address(1), U256::zero(), U256::from(1));

let bundle = mock_make_bundle(
vec![MockOp {
op: op.clone(),
simulation_result: Box::new(move || {
Ok(SimulationResult {
expected_storage: expected_storage.clone(),
..Default::default()
})
}),
}],
vec![],
vec![HandleOpsOut::Success],
vec![],
U256::zero(),
U256::zero(),
true,
actual_storage,
)
.await;

assert!(bundle.ops_per_aggregator.is_empty());
assert_eq!(bundle.rejected_ops, vec![op]);
}

struct MockOp {
op: UserOperation,
simulation_result: Box<dyn Fn() -> Result<SimulationResult, SimulationError> + Send + Sync>,
Expand All @@ -2156,17 +2244,22 @@ mod tests {
vec![],
U256::zero(),
U256::zero(),
false,
ExpectedStorage::default(),
)
.await
}

#[allow(clippy::too_many_arguments)]
async fn mock_make_bundle(
mock_ops: Vec<MockOp>,
mock_aggregators: Vec<MockAggregator>,
mock_handle_ops_call_results: Vec<HandleOpsOut>,
mock_paymaster_deposits: Vec<U256>,
base_fee: U256,
max_priority_fee_per_gas: U256,
notify_condition_not_met: bool,
actual_storage: ExpectedStorage,
) -> Bundle<UserOperation> {
let entry_point_address = address(123);
let beneficiary = address(124);
Expand Down Expand Up @@ -2226,6 +2319,7 @@ mod tests {
.into_iter()
.map(|agg| (agg.address, agg.signature))
.collect();

let mut provider = MockProvider::new();
provider
.expect_get_latest_block_hash_and_number()
Expand All @@ -2236,6 +2330,16 @@ mod tests {
provider
.expect_get_max_priority_fee()
.returning(move || Ok(max_priority_fee_per_gas));
if notify_condition_not_met {
for (addr, slots) in actual_storage.0.into_iter() {
let values = slots.values().cloned().collect::<Vec<_>>();
provider
.expect_batch_get_storage_at()
.withf(move |a, s| *a == addr && s.iter().all(|slot| slots.contains_key(slot)))
.returning(move |_, _| Ok(values.clone()));
}
}

entry_point
.expect_aggregate_signatures()
.returning(move |address, _| Ok(signatures_by_aggregator[&address]().unwrap()));
Expand All @@ -2256,6 +2360,11 @@ mod tests {
},
event_sender,
);

if notify_condition_not_met {
proposer.notify_condition_not_met();
}

proposer
.make_bundle(None, false)
.await
Expand Down
Loading
Loading