Gas cost is only calculated in ondemand mode

Magport · Mar 29, 2024 · 031fb06 · 031fb06
1 parent 6a7edc8
commit 031fb06
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 16 deletions.
diff --git a/pallets/liquidation/src/lib.rs b/pallets/liquidation/src/lib.rs
@@ -168,8 +168,11 @@ pub mod pallet {
 			let base_account_balance = <T as pallet::Config>::Currency::free_balance(&base_account);
 
 			let (collator, real_gas_cost) = match T::OrderGasCost::gas_cost(n) {
-				Some((collator, real_gas_cost)) => (collator, real_gas_cost),
-				None => {
+				Ok(cost) => match cost {
+					Some((collator, real_gas_cost)) => (collator, real_gas_cost),
+					None => return,
+				},
+				Err(_) => {
 					Self::deposit_event(Event::Error(Error::<T>::FailedToFetchRealGasCost.into()));
 					return;
 				},

diff --git a/pallets/liquidation/src/mock.rs b/pallets/liquidation/src/mock.rs
@@ -190,9 +190,11 @@ where
 	T: pallet_order::Config,
 	T::AccountId: From<[u8; 32]>,
 {
-	fn gas_cost(_block_number: BlockNumberFor<T>) -> Option<(T::AccountId, Balance)> {
+	fn gas_cost(
+		_block_number: BlockNumberFor<T>,
+	) -> Result<Option<(T::AccountId, Balance)>, sp_runtime::DispatchError> {
 		let account = T::AccountId::try_from(COLLATOR_BYTES).unwrap();
-		Some((account, 10000000 as u128))
+		Ok(Some((account, 10000000 as u128)))
 	}
 }
 

diff --git a/pallets/order/src/lib.rs b/pallets/order/src/lib.rs
@@ -407,5 +407,7 @@ impl<T: Config> Pallet<T> {
 }
 
 pub trait OrderGasCost<T: frame_system::Config> {
-	fn gas_cost(block_number: BlockNumberFor<T>) -> Option<(T::AccountId, Balance)>;
+	fn gas_cost(
+		block_number: BlockNumberFor<T>,
+	) -> Result<Option<(T::AccountId, Balance)>, DispatchError>;
 }
diff --git a/pallets/order/src/mock.rs b/pallets/order/src/mock.rs
@@ -115,13 +115,22 @@ where
 	T: crate::Config,
 	T::AccountId: From<[u8; 32]>,
 {
-	fn gas_cost(block_number: BlockNumberFor<T>) -> Option<(T::AccountId, Balance)> {
-		let sequece_number = <crate::Pallet<T>>::block_2_sequence(block_number)?;
-		let order = <crate::Pallet<T>>::order_map(sequece_number)?;
+	fn gas_cost(
+		block_number: BlockNumberFor<T>,
+	) -> Result<Option<(T::AccountId, Balance)>, sp_runtime::DispatchError> {
+		let sequece_number = <crate::Pallet<T>>::block_2_sequence(block_number);
+		if sequece_number.is_none() {
+			return Ok(None);
+		}
+		let order = <crate::Pallet<T>>::order_map(
+			sequece_number.ok_or(sp_runtime::DispatchError::Other("sequece_number is none"))?,
+		)
+		.ok_or(sp_runtime::DispatchError::Other("Not exist order"))?;
 		let mut r = [0u8; 32];
 		r.copy_from_slice(order.orderer.encode().as_slice());
-		let account = T::AccountId::try_from(r).ok()?;
-		Some((account, order.price))
+		let account = T::AccountId::try_from(r)
+			.map_err(|_| sp_runtime::DispatchError::Other("Account error"))?;
+		Ok(Some((account, order.price)))
 	}
 }
 
@@ -142,7 +151,7 @@ pub mod mock_pallet {
 
 	impl<T: Config> Pallet<T> {
 		pub fn get_gas_cost(block_number: BlockNumberFor<T>) -> Option<(T::AccountId, Balance)> {
-			T::OrderGasCost::gas_cost(block_number)
+			T::OrderGasCost::gas_cost(block_number).unwrap()
 		}
 	}
 }

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -696,13 +696,22 @@ where
 	T: pallet_order::Config,
 	T::AccountId: From<[u8; 32]>,
 {
-	fn gas_cost(block_number: BlockNumberFor<T>) -> Option<(T::AccountId, Balance)> {
-		let sequece_number = <pallet_order::Pallet<T>>::block_2_sequence(block_number)?;
-		let order = <pallet_order::Pallet<T>>::order_map(sequece_number)?;
+	fn gas_cost(
+		block_number: BlockNumberFor<T>,
+	) -> Result<Option<(T::AccountId, Balance)>, sp_runtime::DispatchError> {
+		let sequece_number = <pallet_order::Pallet<T>>::block_2_sequence(block_number);
+		if sequece_number.is_none() {
+			return Ok(None);
+		}
+		let order = <pallet_order::Pallet<T>>::order_map(
+			sequece_number.ok_or(sp_runtime::DispatchError::Other("sequece_number is none"))?,
+		)
+		.ok_or(sp_runtime::DispatchError::Other("Not exist order"))?;
 		let mut r = [0u8; 32];
 		r.copy_from_slice(order.orderer.encode().as_slice());
-		let account = T::AccountId::try_from(r).ok()?;
-		Some((account, order.price))
+		let account = T::AccountId::try_from(r)
+			.map_err(|_| sp_runtime::DispatchError::Other("Account error"))?;
+		Ok(Some((account, order.price)))
 	}
 }