Skip to content

Commit

Permalink
chore(style): apply make style
Browse files Browse the repository at this point in the history
  • Loading branch information
@hussein-aitlahcen
hussein-aitlahcen committed Mar 17, 2022
1 parent 8042278 commit 18d20c9
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 21 deletions.
16 changes: 8 additions & 8 deletions frame/mosaic/src/benchmarking.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ benchmarks! {
let network_id: T::NetworkId = 1.into();
let network_info = NetworkInfo {
enabled: true,
min_transfer_size: MIN_TRANSFER_SIZE.into(),
min_transfer_size: MIN_TRANSFER_SIZE.into(),
max_transfer_size: MAX_TRANSFER_SIZE.into(),
};

Expand All @@ -57,7 +57,7 @@ benchmarks! {
let network_id: T::NetworkId = 1.into();
let network_info = NetworkInfo {
enabled: true,
min_transfer_size: MIN_TRANSFER_SIZE.into(),
min_transfer_size: MIN_TRANSFER_SIZE.into(),
max_transfer_size: MAX_TRANSFER_SIZE.into(),
};
assert_ok!(Mosaic::<T>::set_network(RawOrigin::Signed(relayer).into(), network_id.clone(), network_info));
Expand Down Expand Up @@ -85,7 +85,7 @@ benchmarks! {
let network_id: T::NetworkId = 1.into();
let network_info = NetworkInfo {
enabled: true,
min_transfer_size: MIN_TRANSFER_SIZE.into(),
min_transfer_size: MIN_TRANSFER_SIZE.into(),
max_transfer_size: MAX_TRANSFER_SIZE.into(),
};
assert_ok!(Mosaic::<T>::set_network(RawOrigin::Signed(relayer.clone()).into(), network_id.clone(), network_info));
Expand Down Expand Up @@ -114,7 +114,7 @@ benchmarks! {
let network_id: T::NetworkId = 1.into();
let network_info = NetworkInfo {
enabled: true,
min_transfer_size: MIN_TRANSFER_SIZE.into(),
min_transfer_size: MIN_TRANSFER_SIZE.into(),
max_transfer_size: MAX_TRANSFER_SIZE.into(),
};
assert_ok!(Mosaic::<T>::set_network(RawOrigin::Signed(relayer.clone()).into(), network_id.clone(), network_info));
Expand Down Expand Up @@ -144,7 +144,7 @@ benchmarks! {
let network_id: T::NetworkId = 1.into();
let network_info = NetworkInfo {
enabled: true,
min_transfer_size: MIN_TRANSFER_SIZE.into(),
min_transfer_size: MIN_TRANSFER_SIZE.into(),
max_transfer_size: MAX_TRANSFER_SIZE.into(),
};
assert_ok!(Mosaic::<T>::set_network(RawOrigin::Signed(relayer.clone()).into(), network_id.clone(), network_info));
Expand Down Expand Up @@ -180,7 +180,7 @@ benchmarks! {
let network_id: T::NetworkId = 1.into();
let network_info = NetworkInfo {
enabled: true,
min_transfer_size: MIN_TRANSFER_SIZE.into(),
min_transfer_size: MIN_TRANSFER_SIZE.into(),
max_transfer_size: MAX_TRANSFER_SIZE.into(),
};
assert_ok!(Mosaic::<T>::set_network(RawOrigin::Signed(relayer.clone()).into(), network_id.clone(), network_info));
Expand Down Expand Up @@ -216,7 +216,7 @@ benchmarks! {
let network_id: T::NetworkId = 1.into();
let network_info = NetworkInfo {
enabled: true,
min_transfer_size: MIN_TRANSFER_SIZE.into(),
min_transfer_size: MIN_TRANSFER_SIZE.into(),
max_transfer_size: MAX_TRANSFER_SIZE.into(),
};
assert_ok!(Mosaic::<T>::set_network(RawOrigin::Signed(relayer.clone()).into(), network_id.clone(), network_info));
Expand Down Expand Up @@ -252,7 +252,7 @@ benchmarks! {
let network_id: T::NetworkId = 1.into();
let network_info = NetworkInfo {
enabled: true,
min_transfer_size: MIN_TRANSFER_SIZE.into(),
min_transfer_size: MIN_TRANSFER_SIZE.into(),
max_transfer_size: MAX_TRANSFER_SIZE.into(),
};

Expand Down
4 changes: 2 additions & 2 deletions frame/mosaic/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pub mod pallet {
#[derive(Clone, Debug, Encode, Decode, MaxEncodedLen, TypeInfo, PartialEq)]
pub struct NetworkInfo<Balance> {
pub enabled: bool,
pub min_transfer_size: Balance,
pub min_transfer_size: Balance,
pub max_transfer_size: Balance,
}

Expand Down Expand Up @@ -342,7 +342,7 @@ pub mod pallet {
NoStaleTransactions,
InsufficientBudget,
ExceedsMaxTransferSize,
BelowMinTransferSize,
BelowMinTransferSize,
NoClaimableTx,
TxStillLocked,
NoOutgoingTx,
Expand Down
19 changes: 11 additions & 8 deletions frame/mosaic/src/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,8 @@ mod set_network {
#[test]
fn relayer_can_set_network() {
let network_id = 3;
let network_info = NetworkInfo { enabled: false, min_transfer_size: 1, max_transfer_size: 100000 };
let network_info =
NetworkInfo { enabled: false, min_transfer_size: 1, max_transfer_size: 100000 };
new_test_ext().execute_with(|| {
assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER));

Expand All @@ -234,7 +235,8 @@ mod set_network {
#[test]
fn root_cannot_set_network() {
let network_id = 3;
let network_info = NetworkInfo { enabled: false, min_transfer_size: 1, max_transfer_size: 100000 };
let network_info =
NetworkInfo { enabled: false, min_transfer_size: 1, max_transfer_size: 100000 };
new_test_ext().execute_with(|| {
assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER));

Expand All @@ -248,7 +250,8 @@ mod set_network {
#[test]
fn none_cannot_set_network() {
let network_id = 3;
let network_info = NetworkInfo { enabled: false, min_transfer_size: 1, max_transfer_size: 100000 };
let network_info =
NetworkInfo { enabled: false, min_transfer_size: 1, max_transfer_size: 100000 };
new_test_ext().execute_with(|| {
assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER));

Expand Down Expand Up @@ -616,7 +619,7 @@ mod timelocked_mint {
fn can_mint_up_to_the_penalised_budget(
account_a in account_id(),
decay in 1..100u128, // todo,
min_transfer_size in 1..10_000_000u128,
min_transfer_size in 1..10_000_000u128,
max_transfer_size in 10_000_000u128..100_000_000u128,
asset_id in 1..100u128,
network_id in 1..100u32,
Expand Down Expand Up @@ -654,7 +657,7 @@ mod timelocked_mint {
fn cannot_mint_more_than_the_penalised_budget(
account_a in account_id(),
decay in 1..100u128, // todo,
min_transfer_size in 1..10_000_000u128,
min_transfer_size in 1..10_000_000u128,
max_transfer_size in 10_000_000u128..100_000_000u128,
asset_id in 1..100u128,
network_id in 1..100u32,
Expand Down Expand Up @@ -693,7 +696,7 @@ mod timelocked_mint {
fn should_be_able_to_mint_again_after_waiting_for_penalty_to_decay(
account_a in account_id(),
decay_factor in 1..100u128, // todo,
min_transfer_size in 1..10_000_000u128,
min_transfer_size in 1..10_000_000u128,
max_transfer_size in 10_000_000u128..100_000_000u128,
asset_id in 1..100u128,
network_id in 1..100u32,
Expand Down Expand Up @@ -1036,7 +1039,7 @@ mod transfer_to {
#[test]
fn transfer_to_below_min_transfer_size() {
ExtBuilder { balances: Default::default() }.build().execute_with(|| {
let min_transfer_size = 1000;
let min_transfer_size = 1000;
let max_transfer_size = 100000;

assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER));
Expand Down Expand Up @@ -1083,7 +1086,7 @@ mod transfer_to {
#[test]
fn transfer_to_exceeds_max_transfer_size() {
ExtBuilder { balances: Default::default() }.build().execute_with(|| {
let min_transfer_size = 1;
let min_transfer_size = 1;
let max_transfer_size = 100000;

assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER));
Expand Down
6 changes: 3 additions & 3 deletions frame/vesting/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ pub mod module {
AmountLow,
/// Failed because the maximum vesting schedules was exceeded
MaxVestingSchedulesExceeded,
/// Trying to vest to ourselves
TryingToSelfVest
/// Trying to vest to ourselves
TryingToSelfVest,
}

#[pallet::event]
Expand Down Expand Up @@ -309,7 +309,7 @@ impl<T: Config> VestedTransfer for Pallet<T> {
to: &Self::AccountId,
schedule: VestingSchedule<Self::BlockNumber, Self::Moment, Self::Balance>,
) -> frame_support::dispatch::DispatchResult {
ensure!(from != to, Error::<T>::TryingToSelfVest);
ensure!(from != to, Error::<T>::TryingToSelfVest);

let schedule_amount = ensure_valid_vesting_schedule::<T>(&schedule)?;

Expand Down

0 comments on commit 18d20c9

Please sign in to comment.