fix: cargo fmt

alchemyplatform · Nov 6, 2024 · 75d35fb · 75d35fb
1 parent 955b70b
commit 75d35fb
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 37 deletions.
diff --git a/crates/builder/src/bundle_proposer.rs b/crates/builder/src/bundle_proposer.rs
@@ -12,7 +12,11 @@
 // If not, see https://www.gnu.org/licenses/.
 
 use std::{
-    collections::{BTreeMap, HashMap, HashSet}, future::Future, mem, pin::Pin, sync::Arc
+    collections::{BTreeMap, HashMap, HashSet},
+    future::Future,
+    mem,
+    pin::Pin,
+    sync::Arc,
 };
 
 use alloy_primitives::{Address, Bytes, B256, U256};
@@ -1469,7 +1473,8 @@ impl<UO: UserOperation> ProposalContext<UO> {
                     // [EREP-015] If user operations error derived from factory or account, paymaster opsSeen amendment is required.
                     tracing::info!("HERE!!!");
                     tracing::info!("{}", &entry_point_reason[..3]);
-                    paymaster_amendment_required |= matches!(&entry_point_reason[..3], "AA1" | "AA2");
+                    paymaster_amendment_required |=
+                        matches!(&entry_point_reason[..3], "AA1" | "AA2");
                 }
                 SimulationViolation::OutOfGas(entity) => {
                     self.add_entity_update(entity, entity_infos)
@@ -1548,8 +1553,7 @@ impl<UO: UserOperation> ProposalContext<UO> {
 
     fn add_erep_015_paymaster_amendment(&mut self, address: Address) {
         // Insert to entity_updates if entry is vacant, otherwise increment the value (precicely EntityUpdate.value)
-        self
-            .entity_updates
+        self.entity_updates
             .entry(address)
             .and_modify(|e| {
                 if let Some(value) = &mut e.value {
@@ -2066,7 +2070,7 @@ mod tests {
 
         let deposit = parse_units("1", "ether").unwrap().into();
 
-        let entity_infos = EntityInfos{
+        let entity_infos = EntityInfos {
             sender: EntityInfo::new(Entity::account(sender), false),
             factory: Some(EntityInfo::new(Entity::factory(staked_factory), true)),
             paymaster: Some(EntityInfo::new(Entity::paymaster(paymaster), false)),
@@ -2107,7 +2111,7 @@ mod tests {
             EntityUpdate {
                 entity: Entity::paymaster(paymaster),
                 update_type: EntityUpdateType::PaymasterOpsSeenDecrement,
-                value: Some(1)
+                value: Some(1),
             },
         ];
 
@@ -2125,7 +2129,7 @@ mod tests {
 
         let deposit = parse_units("1", "ether").unwrap().into();
 
-        let entity_infos = EntityInfos{
+        let entity_infos = EntityInfos {
             sender: EntityInfo::new(Entity::account(sender), true),
             factory: None,
             paymaster: Some(EntityInfo::new(Entity::paymaster(paymaster), false)),
@@ -2166,13 +2170,13 @@ mod tests {
             EntityUpdate {
                 entity: Entity::paymaster(paymaster),
                 update_type: EntityUpdateType::PaymasterOpsSeenDecrement,
-                value: Some(1)
+                value: Some(1),
             },
         ];
 
         // we want to check that the entity updates are the same regardless of order
         actual_entity_updates.sort_by(|a, b| a.entity.address.cmp(&b.entity.address));
-        expected_entity_updates.sort_by(|a, b|  a.entity.address.cmp(&b.entity.address));
+        expected_entity_updates.sort_by(|a, b| a.entity.address.cmp(&b.entity.address));
 
         assert_eq!(actual_entity_updates, expected_entity_updates);
     }
@@ -2186,14 +2190,14 @@ mod tests {
 
         let deposit = parse_units("1", "ether").unwrap().into();
 
-        let entity_infos_1 = EntityInfos{
+        let entity_infos_1 = EntityInfos {
             sender: EntityInfo::new(Entity::account(sender_1), false),
             factory: Some(EntityInfo::new(Entity::factory(factory), false)),
             paymaster: Some(EntityInfo::new(Entity::paymaster(paymaster), false)),
             aggregator: None,
         };
 
-        let entity_infos_2 = EntityInfos{
+        let entity_infos_2 = EntityInfos {
             sender: EntityInfo::new(Entity::account(sender_2), false),
             factory: Some(EntityInfo::new(Entity::factory(factory), false)),
             paymaster: Some(EntityInfo::new(Entity::paymaster(paymaster), false)),
@@ -2211,11 +2215,14 @@ mod tests {
                     simulation_result: Box::new(move || {
                         Err(SimulationError {
                             violation_error: ViolationError::Violations(vec![
-                                SimulationViolation::ValidationRevert(ValidationRevert::Operation {
-                                    entry_point_reason: "AA1x: factory related errors".to_string(),
-                                    inner_revert_reason: None,
-                                    inner_revert_data: Bytes::new(),
-                                }),
+                                SimulationViolation::ValidationRevert(
+                                    ValidationRevert::Operation {
+                                        entry_point_reason: "AA1x: factory related errors"
+                                            .to_string(),
+                                        inner_revert_reason: None,
+                                        inner_revert_data: Bytes::new(),
+                                    },
+                                ),
                             ]),
                             entity_infos: Some(entity_infos_1),
                         })
@@ -2226,11 +2233,14 @@ mod tests {
                     simulation_result: Box::new(move || {
                         Err(SimulationError {
                             violation_error: ViolationError::Violations(vec![
-                                SimulationViolation::ValidationRevert(ValidationRevert::Operation {
-                                    entry_point_reason: "AA2x: sender related errors".to_string(),
-                                    inner_revert_reason: None,
-                                    inner_revert_data: Bytes::new(),
-                                }),
+                                SimulationViolation::ValidationRevert(
+                                    ValidationRevert::Operation {
+                                        entry_point_reason: "AA2x: sender related errors"
+                                            .to_string(),
+                                        inner_revert_reason: None,
+                                        inner_revert_data: Bytes::new(),
+                                    },
+                                ),
                             ]),
                             entity_infos: Some(entity_infos_2),
                         })
@@ -2249,13 +2259,11 @@ mod tests {
         .await;
 
         let actual_entity_updates = bundle.entity_updates;
-        let expected_entity_updates = vec![
-            EntityUpdate {
-                entity: Entity::paymaster(paymaster),
-                update_type: EntityUpdateType::PaymasterOpsSeenDecrement,
-                value: Some(2),
-            },
-        ];
+        let expected_entity_updates = vec![EntityUpdate {
+            entity: Entity::paymaster(paymaster),
+            update_type: EntityUpdateType::PaymasterOpsSeenDecrement,
+            value: Some(2),
+        }];
 
         assert_eq!(actual_entity_updates, expected_entity_updates);
     }
@@ -2848,15 +2856,19 @@ mod tests {
         }
     }
 
-    fn op_with_sender_factory_paymaster(sender: Address, factory: Address, paymaster: Address) -> UserOperation {
+    fn op_with_sender_factory_paymaster(
+        sender: Address,
+        factory: Address,
+        paymaster: Address,
+    ) -> UserOperation {
         UserOperation {
             sender,
             init_code: factory.to_vec().into(),
             paymaster_and_data: paymaster.to_vec().into(),
             pre_verification_gas: DEFAULT_PVG,
             ..Default::default()
         }
-    } 
+    }
 
     fn op_with_sender_and_fees(
         sender: Address,

diff --git a/crates/pool/src/mempool/uo_pool.rs b/crates/pool/src/mempool/uo_pool.rs
@@ -733,9 +733,16 @@ where
                 self.reputation.handle_srep_050_penalty(entity.address);
             }
             EntityUpdateType::PaymasterOpsSeenDecrement => {
-                assert!(entity.is_paymaster(), "Attempted to add EREP-015 paymaster amendment for non-paymaster entity");
-                assert!(update.value.is_some(), "PaymasterOpsSeenDecrement must carry an explicit decrement value");
-                self.reputation.remove_seen(entity.address, update.value.unwrap());
+                assert!(
+                    entity.is_paymaster(),
+                    "Attempted to add EREP-015 paymaster amendment for non-paymaster entity"
+                );
+                assert!(
+                    update.value.is_some(),
+                    "PaymasterOpsSeenDecrement must carry an explicit decrement value"
+                );
+                self.reputation
+                    .remove_seen(entity.address, update.value.unwrap());
             }
         }
 

diff --git a/crates/pool/src/server/remote/protos.rs b/crates/pool/src/server/remote/protos.rs
@@ -266,7 +266,9 @@ impl From<RundlerEntityUpdateType> for EntityUpdateType {
         match update_type {
             RundlerEntityUpdateType::UnstakedInvalidation => EntityUpdateType::UnstakedInvalidation,
             RundlerEntityUpdateType::StakedInvalidation => EntityUpdateType::StakedInvalidation,
-            RundlerEntityUpdateType::PaymasterOpsSeenDecrement => EntityUpdateType::PaymasterAmendment,
+            RundlerEntityUpdateType::PaymasterOpsSeenDecrement => {
+                EntityUpdateType::PaymasterAmendment
+            }
         }
     }
 }

diff --git a/crates/types/src/entity.rs b/crates/types/src/entity.rs
@@ -131,7 +131,9 @@ impl Serialize for Entity {
 }
 
 /// Updates that can be applied to an entity
-#[derive(Display, Debug, Default, Clone, Ord, Copy, Eq, PartialEq, EnumIter, PartialOrd, Deserialize)]
+#[derive(
+    Display, Debug, Default, Clone, Ord, Copy, Eq, PartialEq, EnumIter, PartialOrd, Deserialize,
+)]
 #[display(style = "camelCase")]
 #[serde(rename_all = "camelCase")]
 pub enum EntityUpdateType {
@@ -151,9 +153,11 @@ impl TryFrom<i32> for EntityUpdateType {
         match update_type {
             x if x == EntityUpdateType::UnstakedInvalidation as i32 => {
                 Ok(Self::UnstakedInvalidation)
-            },
+            }
             x if x == EntityUpdateType::StakedInvalidation as i32 => Ok(Self::StakedInvalidation),
-            x if x == EntityUpdateType::PaymasterOpsSeenDecrement as i32 => Ok(Self::PaymasterOpsSeenDecrement),
+            x if x == EntityUpdateType::PaymasterOpsSeenDecrement as i32 => {
+                Ok(Self::PaymasterOpsSeenDecrement)
+            }
             _ => bail!("Invalid entity update type: {}", update_type),
         }
     }