1.Modify move dependencies 2.In ondemand mode, only the information o…

…f your own chain is displayed
Magport · Sep 13, 2024 · 4386a62 · 4386a62
1 parent 6efd0f7
commit 4386a62
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/coretime/bulk/src/lib.rs b/client/coretime/bulk/src/lib.rs
@@ -211,13 +211,12 @@ where
 										let constant_query =
 											subxt::dynamic::constant("Broker", "TimeslicePeriod");
 
-										let time_slice = api
-											.constants()
-											.at(&constant_query)?
-											.to_value()?
-											.as_u128()
-											.expect("coretime parachain time slice none")
-											as u32;
+										let time_slice =
+											api.constants()
+												.at(&constant_query)?
+												.to_value()?
+												.as_u128()
+												.expect("coretime parachain time slice none") as u32;
 
 										item.end_relaychain_height =
 											ev.when + item.duration * time_slice;

diff --git a/client/coretime/on-demand/src/lib.rs b/client/coretime/on-demand/src/lib.rs
@@ -493,13 +493,13 @@ pub async fn ondemand_event_task(
 			let ev_order_placed = event.as_event::<metadata::OnDemandOrderPlacedV0>();
 			if let Ok(order_placed_event) = ev_order_placed {
 				if let Some(ev) = order_placed_event {
-					log::info!(
-						"=====================Find OnDemandOrderPlaced event:{:?},{:?}================",
-						ev.para_id,
-						ev.spot_price,
-					);
 					let exp_id: u32 = para_id.into();
 					if ev.para_id.0 == exp_id {
+						log::info!(
+							"=====================Find OnDemandOrderPlaced event:{:?},{:?}================",
+							ev.para_id,
+							ev.spot_price,
+						);
 						// The orderer gets it from the slot by default.
 						let mut order_record_local = order_record.lock().await;
 						order_record_local.price = ev.spot_price;

diff --git a/pallets/liquidation/src/lib.rs b/pallets/liquidation/src/lib.rs
@@ -673,8 +673,7 @@ pub mod pallet {
 			let total_existing_operation_ratio: u32 =
 				OperationRatios::<T>::iter().map(|(_, r)| r).sum();
 			let total_ratio = system_ratio
-				+ treasury_ratio
-				+ collator_ratio
+				+ treasury_ratio + collator_ratio
 				+ total_existing_operation_ratio
 				+ ratio;
 			log::info!("3 -+-+-+-+-+ set operation ratio, total ratio:{:?}, system_ratio:{:?}, treasury_ratio:{:?}, collator_ratio:{:?}, operation account:{:?}, op_ratio:{:?}",

diff --git a/runtime/src/xcms/xcm_weight.rs b/runtime/src/xcms/xcm_weight.rs
@@ -285,8 +285,7 @@ impl<
 		AccountId,
 		Currency: CurrencyT<AccountId>,
 		OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,
-	> WeightTrader
-	for UsingComponentsEx<WeightToFee, AssetIdValue, AccountId, Currency, OnUnbalanced>
+	> WeightTrader for UsingComponentsEx<WeightToFee, AssetIdValue, AccountId, Currency, OnUnbalanced>
 {
 	fn new() -> Self {
 		Self(Weight::zero(), Zero::zero(), PhantomData)