formatting

gasp-xyz · Feb 16, 2024 · c28afa2 · c28afa2
1 parent ef04780
commit c28afa2
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 35 deletions.
diff --git a/pallets/rolldown/src/lib.rs b/pallets/rolldown/src/lib.rs
@@ -6,7 +6,7 @@ use frame_support::{
 	StorageHasher,
 };
 use frame_system::{ensure_signed, pallet_prelude::*};
-use messages::{UpdateType, PendingRequestType};
+use messages::{PendingRequestType, UpdateType};
 use sp_runtime::traits::SaturatedConversion;
 
 use alloy_sol_types::SolValue;
@@ -219,26 +219,35 @@ pub mod pallet {
 			ensure!(!requests.order.is_empty(), Error::<T>::EmptyUpdate);
 			ensure!(requests.order.len() <= 10, Error::<T>::TooManyRequests);
 
-
 			let withdraws_count = requests.pendingWithdraws.len();
 			let deposits_count = requests.pendingDeposits.len();
 			let cancels_count = requests.pendingCancelResultions.len();
 			let l2_updates_count = requests.pendingL2UpdatesToRemove.len();
 
 			ensure!(
-				requests.order.iter().filter(|e| **e == PendingRequestType::DEPOSIT).count() == deposits_count,
+				requests.order.iter().filter(|e| **e == PendingRequestType::DEPOSIT).count() ==
+					deposits_count,
 				Error::<T>::InvalidUpdate
 			);
 			ensure!(
-				requests.order.iter().filter(|e| **e == PendingRequestType::WITHDRAWAL).count() == withdraws_count,
+				requests.order.iter().filter(|e| **e == PendingRequestType::WITHDRAWAL).count() ==
+					withdraws_count,
 				Error::<T>::InvalidUpdate
 			);
 			ensure!(
-				requests.order.iter().filter(|e| **e == PendingRequestType::CANCEL_RESOLUTION).count() == cancels_count,
+				requests
+					.order
+					.iter()
+					.filter(|e| **e == PendingRequestType::CANCEL_RESOLUTION)
+					.count() == cancels_count,
 				Error::<T>::InvalidUpdate
 			);
 			ensure!(
-				requests.order.iter().filter(|e| **e == PendingRequestType::L2_UPDATES_TO_REMOVE).count() == l2_updates_count,
+				requests
+					.order
+					.iter()
+					.filter(|e| **e == PendingRequestType::L2_UPDATES_TO_REMOVE)
+					.count() == l2_updates_count,
 				Error::<T>::InvalidUpdate
 			);
 

diff --git a/pallets/rolldown/src/tests.rs b/pallets/rolldown/src/tests.rs
@@ -193,7 +193,6 @@ fn each_request_executed_only_once() {
 			forward_to_block::<Test>(11);
 			Rolldown::update_l2_from_l1(RuntimeOrigin::signed(BOB), update).unwrap();
 
-
 			forward_to_block::<Test>(14);
 			assert!(!pending_updates::<Test>::contains_key(sp_core::U256::from(0u128)));
 			assert_eq!(TokensOf::<Test>::free_balance(ETH_TOKEN_ADDRESS_MGX, &CHARLIE), 0_u128);
@@ -369,44 +368,41 @@ fn cancel_request() {
 #[test]
 #[serial]
 fn reject_update_with_too_many_requests() {
-	ExtBuilder::new()
-		.execute_with_default_mocks(|| {
-			forward_to_block::<Test>(10);
+	ExtBuilder::new().execute_with_default_mocks(|| {
+		forward_to_block::<Test>(10);
 
-			let requests =
-				vec![
-					L1UpdateRequest::Withdraw(messages::Withdraw {
-					depositRecipient: ETH_RECIPIENT_ACCOUNT,
-					tokenAddress: ETH_TOKEN_ADDRESS,
-					amount: sp_core::U256::from(MILLION),
-				}); 11];
+		let requests = vec![
+			L1UpdateRequest::Withdraw(messages::Withdraw {
+				depositRecipient: ETH_RECIPIENT_ACCOUNT,
+				tokenAddress: ETH_TOKEN_ADDRESS,
+				amount: sp_core::U256::from(MILLION),
+			});
+			11
+		];
 
-			let withdraw_update = create_l1_update(requests);
+		let withdraw_update = create_l1_update(requests);
 
-			assert_err!(
-				Rolldown::update_l2_from_l1(RuntimeOrigin::signed(ALICE), withdraw_update),
-				Error::<Test>::TooManyRequests
-			);
-		});
+		assert_err!(
+			Rolldown::update_l2_from_l1(RuntimeOrigin::signed(ALICE), withdraw_update),
+			Error::<Test>::TooManyRequests
+		);
+	});
 }
 
 #[test]
 #[serial]
 fn reject_update_with_missing_requests() {
-	ExtBuilder::new()
-		.execute_with_default_mocks(|| {
-			forward_to_block::<Test>(10);
+	ExtBuilder::new().execute_with_default_mocks(|| {
+		forward_to_block::<Test>(10);
 
-			let update = L1Update {
-				order: vec![messages::PendingRequestType::DEPOSIT],
-				.. Default::default()
-			};
+		let update =
+			L1Update { order: vec![messages::PendingRequestType::DEPOSIT], ..Default::default() };
 
-			assert_err!(
-				Rolldown::update_l2_from_l1(RuntimeOrigin::signed(ALICE), update),
-				Error::<Test>::InvalidUpdate
-			);
-		});
+		assert_err!(
+			Rolldown::update_l2_from_l1(RuntimeOrigin::signed(ALICE), update),
+			Error::<Test>::InvalidUpdate
+		);
+	});
 }
 
 #[test]