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

fmt fixes #1413

Merged
merged 1 commit into from
Sep 6, 2023
Merged

fmt fixes #1413

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
5 changes: 3 additions & 2 deletions polkadot/xcm/src/v3/multiasset.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ use crate::v2::{
WildMultiAsset as OldWildMultiAsset,
};
use alloc::{vec, vec::Vec};
use bounded_collections::{BoundedVec, ConstU32};
use core::{
cmp::Ordering,
convert::{TryFrom, TryInto},
};
use parity_scale_codec::{self as codec, Decode, Encode, MaxEncodedLen};
use scale_info::TypeInfo;
use bounded_collections::{BoundedVec, ConstU32};

/// A general identifier for an instance of a non-fungible asset class.
#[derive(
Expand Down Expand Up @@ -518,7 +518,8 @@ impl MaxEncodedLen for MultiAssets {

impl Decode for MultiAssets {
fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
let bounded_instructions = BoundedVec::<MultiAsset, ConstU32<{ MAX_ITEMS_IN_MULTIASSETS as u32 }>>::decode(input)?;
let bounded_instructions =
BoundedVec::<MultiAsset, ConstU32<{ MAX_ITEMS_IN_MULTIASSETS as u32 }>>::decode(input)?;
Self::from_sorted_and_deduplicated(bounded_instructions.into_inner())
.map_err(|()| "Out of order".into())
}
Expand Down
8 changes: 2 additions & 6 deletions substrate/frame/broker/src/dispatchable_impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,12 +333,8 @@ impl<T: Config> Pallet<T> {
region.begin = r + 1;
contribution.length.saturating_dec();

let Some(mut pool_record) = InstaPoolHistory::<T>::get(r) else {
continue
};
let Some(total_payout) = pool_record.maybe_payout else {
break
};
let Some(mut pool_record) = InstaPoolHistory::<T>::get(r) else { continue };
let Some(total_payout) = pool_record.maybe_payout else { break };
let p = total_payout
.saturating_mul(contributed_parts.into())
.checked_div(&pool_record.private_contributions.into())
Expand Down
8 changes: 2 additions & 6 deletions substrate/frame/broker/src/tick_impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,7 @@ impl<T: Config> Pallet<T> {
}

pub(crate) fn process_revenue() -> bool {
let Some((until, amount)) = T::Coretime::check_notify_revenue_info() else {
return false
};
let Some((until, amount)) = T::Coretime::check_notify_revenue_info() else { return false };
let when: Timeslice =
(until / T::TimeslicePeriod::get()).saturating_sub(One::one()).saturated_into();
let mut revenue = T::ConvertBalance::convert_back(amount);
Expand Down Expand Up @@ -289,9 +287,7 @@ impl<T: Config> Pallet<T> {
rc_begin: RelayBlockNumberOf<T>,
core: CoreIndex,
) {
let Some(workplan) = Workplan::<T>::take((timeslice, core)) else {
return
};
let Some(workplan) = Workplan::<T>::take((timeslice, core)) else { return };
let workload = Workload::<T>::get(core);
let parts_used = workplan.iter().map(|i| i.mask).fold(CoreMask::void(), |a, i| a | i);
let mut workplan = workplan.into_inner();
Expand Down