Skip to content

Commit ab60c04

Browse files
Stephenlawrence00Stephenlawrence00
committed
cargo fmt
1 parent b27ef01 commit ab60c04

File tree

2 files changed

+93
-51
lines changed

2 files changed

+93
-51
lines changed

‎substrate/frame/lottery/src/mock.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use crate as pallet_lottery;
2323
use frame_support::{derive_impl, parameter_types, traits::ConstU32};
2424
use frame_support_test::TestRandomness;
2525
use frame_system::EnsureRoot;
26-
use sp_runtime::{BuildStorage, Perbill,};
26+
use sp_runtime::{BuildStorage, Perbill};
2727

2828
type Block = frame_system::mocking::MockBlock<Test>;
2929

‎substrate/frame/lottery/src/tests.rs‎

Lines changed: 92 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ fn basic_end_to_end_works() {
5252
dest: 0,
5353
value: 0,
5454
})),
55-
versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 0, value: 0 })),
55+
versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
56+
dest: 0,
57+
value: 0,
58+
})),
5659
];
5760

5861
// Set calls for the lottery
@@ -63,9 +66,11 @@ fn basic_end_to_end_works() {
6366
assert!(crate::Lottery::<Test>::get().is_some());
6467

6568
assert_eq!(Balances::free_balance(&1), 100);
66-
let call = Box::new(versioned_call(
67-
RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 2, value: 20 }),
68-
));
69+
let call =
70+
Box::new(versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
71+
dest: 2,
72+
value: 20,
73+
})));
6974
assert_ok!(Lottery::buy_ticket(RuntimeOrigin::signed(1), call.clone()));
7075
// 20 from the transfer, 10 from buying a ticket
7176
assert_eq!(Balances::free_balance(&1), 100 - 20 - 10);
@@ -142,7 +147,10 @@ fn set_calls_works() {
142147
dest: 0,
143148
value: 0,
144149
})),
145-
versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 0, value: 0 })),
150+
versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
151+
dest: 0,
152+
value: 0,
153+
})),
146154
];
147155

148156
assert_ok!(Lottery::set_calls(RuntimeOrigin::root(), calls));
@@ -154,7 +162,10 @@ fn set_calls_works() {
154162
dest: 0,
155163
value: 0,
156164
})),
157-
versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 0, value: 0 })),
165+
versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
166+
dest: 0,
167+
value: 0,
168+
})),
158169
versioned_call(RuntimeCall::System(SystemCall::remark { remark: vec![] })),
159170
];
160171

@@ -220,9 +231,11 @@ fn buy_ticket_works_as_simple_passthrough() {
220231
// as a simple passthrough to the real call.
221232
new_test_ext().execute_with(|| {
222233
// No lottery set up
223-
let call = Box::new(versioned_call(
224-
RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 2, value: 20 }),
225-
));
234+
let call =
235+
Box::new(versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
236+
dest: 2,
237+
value: 20,
238+
})));
226239
// This is just a basic transfer then
227240
assert_ok!(Lottery::buy_ticket(RuntimeOrigin::signed(1), call.clone()));
228241
assert_eq!(Balances::free_balance(&1), 100 - 20);
@@ -235,7 +248,10 @@ fn buy_ticket_works_as_simple_passthrough() {
235248
dest: 0,
236249
value: 0,
237250
})),
238-
versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 0, value: 0 })),
251+
versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
252+
dest: 0,
253+
value: 0,
254+
})),
239255
];
240256
assert_ok!(Lottery::set_calls(RuntimeOrigin::root(), calls));
241257

@@ -246,29 +262,36 @@ fn buy_ticket_works_as_simple_passthrough() {
246262
assert_eq!(TicketsCount::<Test>::get(), 0);
247263

248264
// If call would fail, the whole thing still fails the same
249-
let fail_call = Box::new(versioned_call(
250-
RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 2, value: 1000 }),
251-
));
265+
let fail_call =
266+
Box::new(versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
267+
dest: 2,
268+
value: 1000,
269+
})));
252270
assert_noop!(
253271
Lottery::buy_ticket(RuntimeOrigin::signed(1), fail_call),
254272
ArithmeticError::Underflow,
255273
);
256274

257-
let bad_origin_call = Box::new(versioned_call(
258-
RuntimeCall::Balances(BalancesCall::force_transfer { source: 0, dest: 0, value: 0 }),
259-
));
275+
let bad_origin_call =
276+
Box::new(versioned_call(RuntimeCall::Balances(BalancesCall::force_transfer {
277+
source: 0,
278+
dest: 0,
279+
value: 0,
280+
})));
260281
assert_noop!(Lottery::buy_ticket(RuntimeOrigin::signed(1), bad_origin_call), BadOrigin,);
261282

262283
// User can call other txs, but doesn't get a ticket
263-
let remark_call = Box::new(versioned_call(
264-
RuntimeCall::System(SystemCall::remark { remark: b"hello, world!".to_vec() }),
265-
));
284+
let remark_call = Box::new(versioned_call(RuntimeCall::System(SystemCall::remark {
285+
remark: b"hello, world!".to_vec(),
286+
})));
266287
assert_ok!(Lottery::buy_ticket(RuntimeOrigin::signed(2), remark_call));
267288
assert_eq!(TicketsCount::<Test>::get(), 0);
268289

269-
let successful_call = Box::new(versioned_call(
270-
RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 2, value: 1 }),
271-
));
290+
let successful_call =
291+
Box::new(versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
292+
dest: 2,
293+
value: 1,
294+
})));
272295
assert_ok!(Lottery::buy_ticket(RuntimeOrigin::signed(2), successful_call));
273296
assert_eq!(TicketsCount::<Test>::get(), 1);
274297
});
@@ -280,14 +303,19 @@ fn buy_ticket_works() {
280303
// Set calls for the lottery.
281304
let calls = vec![
282305
versioned_call(RuntimeCall::System(SystemCall::remark { remark: vec![] })),
283-
versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 0, value: 0 })),
306+
versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
307+
dest: 0,
308+
value: 0,
309+
})),
284310
];
285311
assert_ok!(Lottery::set_calls(RuntimeOrigin::root(), calls));
286312

287313
// Can't buy ticket before start
288-
let call = Box::new(versioned_call(
289-
RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 2, value: 1 }),
290-
));
314+
let call =
315+
Box::new(versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
316+
dest: 2,
317+
value: 1,
318+
})));
291319
assert_ok!(Lottery::buy_ticket(RuntimeOrigin::signed(1), call.clone()));
292320
assert_eq!(TicketsCount::<Test>::get(), 0);
293321

@@ -300,16 +328,18 @@ fn buy_ticket_works() {
300328
assert_eq!(TicketsCount::<Test>::get(), 1);
301329

302330
// Can't buy another of the same ticket (even if call is slightly changed)
303-
let call = Box::new(versioned_call(
304-
RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 3, value: 30 }),
305-
));
331+
let call =
332+
Box::new(versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
333+
dest: 3,
334+
value: 30,
335+
})));
306336
assert_ok!(Lottery::buy_ticket(RuntimeOrigin::signed(1), call));
307337
assert_eq!(TicketsCount::<Test>::get(), 1);
308338

309339
// Buy ticket for remark
310-
let call = Box::new(versioned_call(
311-
RuntimeCall::System(SystemCall::remark { remark: b"hello, world!".to_vec() }),
312-
));
340+
let call = Box::new(versioned_call(RuntimeCall::System(SystemCall::remark {
341+
remark: b"hello, world!".to_vec(),
342+
})));
313343
assert_ok!(Lottery::buy_ticket(RuntimeOrigin::signed(1), call.clone()));
314344
assert_eq!(TicketsCount::<Test>::get(), 2);
315345

@@ -331,9 +361,11 @@ fn buy_ticket_works() {
331361
#[test]
332362
fn do_buy_ticket_already_participating() {
333363
new_test_ext().execute_with(|| {
334-
let calls = vec![versioned_call(
335-
RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 0, value: 0 }),
336-
)];
364+
let calls =
365+
vec![versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
366+
dest: 0,
367+
value: 0,
368+
}))];
337369
assert_ok!(Lottery::set_calls(RuntimeOrigin::root(), calls.clone()));
338370
assert_ok!(Lottery::start_lottery(RuntimeOrigin::root(), 1, 10, 10, false));
339371

@@ -348,9 +380,11 @@ fn do_buy_ticket_already_participating() {
348380
#[test]
349381
fn buy_ticket_already_participating() {
350382
new_test_ext().execute_with(|| {
351-
let calls = vec![versioned_call(
352-
RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 0, value: 0 }),
353-
)];
383+
let calls =
384+
vec![versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
385+
dest: 0,
386+
value: 0,
387+
}))];
354388
assert_ok!(Lottery::set_calls(RuntimeOrigin::root(), calls.clone()));
355389
assert_ok!(Lottery::start_lottery(RuntimeOrigin::root(), 1, 10, 10, false));
356390

@@ -370,9 +404,11 @@ fn buy_ticket_already_participating() {
370404
#[test]
371405
fn buy_ticket_insufficient_balance() {
372406
new_test_ext().execute_with(|| {
373-
let calls = vec![versioned_call(
374-
RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 0, value: 0 }),
375-
)];
407+
let calls =
408+
vec![versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
409+
dest: 0,
410+
value: 0,
411+
}))];
376412
assert_ok!(Lottery::set_calls(RuntimeOrigin::root(), calls.clone()));
377413
// Price set to 100.
378414
assert_ok!(Lottery::start_lottery(RuntimeOrigin::root(), 100, 10, 10, false));
@@ -387,9 +423,11 @@ fn buy_ticket_insufficient_balance() {
387423
#[test]
388424
fn do_buy_ticket_insufficient_balance() {
389425
new_test_ext().execute_with(|| {
390-
let calls = vec![versioned_call(
391-
RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 0, value: 0 }),
392-
)];
426+
let calls =
427+
vec![versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
428+
dest: 0,
429+
value: 0,
430+
}))];
393431
assert_ok!(Lottery::set_calls(RuntimeOrigin::root(), calls.clone()));
394432
// Price set to 101.
395433
assert_ok!(Lottery::start_lottery(RuntimeOrigin::root(), 101, 10, 10, false));
@@ -403,9 +441,11 @@ fn do_buy_ticket_insufficient_balance() {
403441
#[test]
404442
fn do_buy_ticket_keep_alive() {
405443
new_test_ext().execute_with(|| {
406-
let calls = vec![versioned_call(
407-
RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 0, value: 0 }),
408-
)];
444+
let calls =
445+
vec![versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
446+
dest: 0,
447+
value: 0,
448+
}))];
409449
assert_ok!(Lottery::set_calls(RuntimeOrigin::root(), calls.clone()));
410450
// Price set to 100.
411451
assert_ok!(Lottery::start_lottery(RuntimeOrigin::root(), 100, 10, 10, false));
@@ -456,9 +496,11 @@ fn choose_ticket_trivial_cases() {
456496
#[test]
457497
fn choose_account_one_participant() {
458498
new_test_ext().execute_with(|| {
459-
let calls = vec![versioned_call(
460-
RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: 0, value: 0 }),
461-
)];
499+
let calls =
500+
vec![versioned_call(RuntimeCall::Balances(BalancesCall::transfer_allow_death {
501+
dest: 0,
502+
value: 0,
503+
}))];
462504
assert_ok!(Lottery::set_calls(RuntimeOrigin::root(), calls.clone()));
463505
assert_ok!(Lottery::start_lottery(RuntimeOrigin::root(), 10, 10, 10, false));
464506
let call = Box::new(calls[0].clone());

0 commit comments

Comments
 (0)