Skip to content

Commit 84a386f

Browse files
Shadow-MMNShadow-MMN
committed
style: cargo fmt
1 parent e02fde6 commit 84a386f

8 files changed

Lines changed: 68 additions & 52 deletions

File tree

‎contracts/events/src/event_ops.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,8 @@ pub fn start_cancel(env: &Env, event_id: u64, op_id: BytesN<32>) -> Result<(), E
297297
// The manager must not be able to drain escrow before winners claim,
298298
// unless the event deadline has passed (liveness escape hatch for
299299
// winners who cannot authenticate).
300-
if matches!(event.release_kind, ReleaseKind::Single) && has_unclaimed_single_winner(env, event_id)
300+
if matches!(event.release_kind, ReleaseKind::Single)
301+
&& has_unclaimed_single_winner(env, event_id)
301302
{
302303
let deadline_passed = event
303304
.deadline
@@ -743,8 +744,7 @@ pub fn claim_prize(
743744
// prize has already been claimed (canonical guard: paid_at).
744745
let anchor_idx = storage::get_winner_index(env, event_id, &recipient, position)
745746
.ok_or(Error::NoSubmissions)?;
746-
let w = storage::winner_at(env, event_id, anchor_idx)
747-
.ok_or(Error::NoSubmissions)?;
747+
let w = storage::winner_at(env, event_id, anchor_idx).ok_or(Error::NoSubmissions)?;
748748
if w.recipient != recipient || w.position != position || w.milestone.is_some() {
749749
return Err(Error::NoSubmissions);
750750
}

‎contracts/events/src/tests/bounty_pillar.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,8 @@ fn apply_on_completed_event_reverts() {
267267

268268
// Pull-model: claim prize to drain escrow and complete the event.
269269
let claim_op = BytesN::random(&ctx.env);
270-
ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &claim_op);
270+
ctx.events
271+
.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &claim_op);
271272

272273
let event = ctx.events.get_event(&bounty_id);
273274
assert_eq!(event.status, EventStatus::Completed);

‎contracts/events/src/tests/cancel_refund.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,8 @@ fn cancel_prorata_splits_remaining_across_partners_no_owner_residual() {
439439
.select_winners(&id, &winners, &BytesN::random(&ctx.env));
440440

441441
// Pull-model: claim prize to drain escrow (60% of 2000 = 1200).
442-
ctx.events.claim_prize(&id, &w, &1_u32, &BytesN::random(&ctx.env));
442+
ctx.events
443+
.claim_prize(&id, &w, &1_u32, &BytesN::random(&ctx.env));
443444

444445
let p1_before = token.balance(&p1);
445446
let p2_before = token.balance(&p2);

‎contracts/events/src/tests/contributions.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,8 @@ fn cancel_at_boundary_pays_partners_full_no_owner_residual() {
368368
let op_select = BytesN::random(&ctx.env);
369369
ctx.events.select_winners(&id, &winners, &op_select);
370370

371-
ctx.events.claim_prize(&id, &winner_a, &1_u32, &BytesN::random(&ctx.env));
371+
ctx.events
372+
.claim_prize(&id, &winner_a, &1_u32, &BytesN::random(&ctx.env));
372373

373374
let after_select = ctx.events.get_event(&id);
374375
assert_eq!(after_select.status, EventStatus::Active);

‎contracts/events/src/tests/cross_contract.rs‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ fn select_winners_pays_recipient_and_bumps_profile() {
123123
ctx.events.select_winners(&bounty_id, &winners, &op_select);
124124

125125
let claim_op = BytesN::random(&ctx.env);
126-
ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &claim_op);
126+
ctx.events
127+
.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &claim_op);
127128

128129
let token = token::Client::new(&ctx.env, &ctx.token_addr);
129130
assert_eq!(token.balance(&ctx.applicant), TOTAL_BUDGET);
@@ -255,8 +256,10 @@ fn select_winners_handles_multi_recipient_distribution() {
255256
ctx.events.select_winners(&bounty_id, &winners, &op_select);
256257

257258
// Pull-model: each winner claims their prize.
258-
ctx.events.claim_prize(&bounty_id, &winner_a, &1_u32, &BytesN::random(&ctx.env));
259-
ctx.events.claim_prize(&bounty_id, &winner_b, &2_u32, &BytesN::random(&ctx.env));
259+
ctx.events
260+
.claim_prize(&bounty_id, &winner_a, &1_u32, &BytesN::random(&ctx.env));
261+
ctx.events
262+
.claim_prize(&bounty_id, &winner_b, &2_u32, &BytesN::random(&ctx.env));
260263

261264
let token = token::Client::new(&ctx.env, &ctx.token_addr);
262265
let amount_a = TOTAL_BUDGET * 60 / 100;
@@ -365,7 +368,8 @@ fn cancel_after_select_winners_refunds_only_remaining() {
365368
ctx.events.select_winners(&bounty_id, &winners, &op_select);
366369

367370
let claim_op = BytesN::random(&ctx.env);
368-
ctx.events.claim_prize(&bounty_id, &winner_a, &1_u32, &claim_op);
371+
ctx.events
372+
.claim_prize(&bounty_id, &winner_a, &1_u32, &claim_op);
369373

370374
let token = token::Client::new(&ctx.env, &ctx.token_addr);
371375
let owner_before = token.balance(&ctx.owner);
@@ -873,27 +877,15 @@ fn grant_last_milestone_sweeps_rounding_residue() {
873877
let before = token.balance(&recipient);
874878

875879
let floored = TOTAL_BUDGET / 3;
876-
ctx.events.claim_milestone(
877-
&grant_id,
878-
&recipient,
879-
&0_u32,
880-
&BytesN::random(&ctx.env),
881-
);
882-
ctx.events.claim_milestone(
883-
&grant_id,
884-
&recipient,
885-
&1_u32,
886-
&BytesN::random(&ctx.env),
887-
);
880+
ctx.events
881+
.claim_milestone(&grant_id, &recipient, &0_u32, &BytesN::random(&ctx.env));
882+
ctx.events
883+
.claim_milestone(&grant_id, &recipient, &1_u32, &BytesN::random(&ctx.env));
888884
let after_two = token.balance(&recipient);
889885
assert_eq!(after_two - before, floored * 2);
890886

891-
ctx.events.claim_milestone(
892-
&grant_id,
893-
&recipient,
894-
&2_u32,
895-
&BytesN::random(&ctx.env),
896-
);
887+
ctx.events
888+
.claim_milestone(&grant_id, &recipient, &2_u32, &BytesN::random(&ctx.env));
897889
let after_all = token.balance(&recipient);
898890
assert_eq!(
899891
after_all - before,
@@ -939,7 +931,12 @@ fn select_winners_pays_against_remaining_escrow_including_top_ups() {
939931
ctx.events.select_winners(&bounty_id, &winners, &op_select);
940932

941933
// Pull-model: claim prize.
942-
ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &BytesN::random(&ctx.env));
934+
ctx.events.claim_prize(
935+
&bounty_id,
936+
&ctx.applicant,
937+
&1_u32,
938+
&BytesN::random(&ctx.env),
939+
);
943940

944941
let token = token::Client::new(&ctx.env, &ctx.token_addr);
945942
assert_eq!(token.balance(&ctx.applicant), TOTAL_BUDGET + top_up);
@@ -1016,7 +1013,12 @@ fn manager_override_can_select_winners() {
10161013
let op_select = BytesN::random(&ctx.env);
10171014
ctx.events.select_winners(&bounty_id, &winners, &op_select);
10181015

1019-
ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &BytesN::random(&ctx.env));
1016+
ctx.events.claim_prize(
1017+
&bounty_id,
1018+
&ctx.applicant,
1019+
&1_u32,
1020+
&BytesN::random(&ctx.env),
1021+
);
10201022

10211023
let event = ctx.events.get_event(&bounty_id);
10221024
assert_eq!(event.status, EventStatus::Completed);

‎contracts/events/src/tests/crowdfunding.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,7 @@ fn claim_milestone_replay_reverts() {
322322
back(&ctx, id, &backer, 600_0000000_i128);
323323

324324
let op = BytesN::random(&ctx.env);
325-
ctx.events
326-
.claim_milestone(&id, &ctx.builder, &0_u32, &op);
325+
ctx.events.claim_milestone(&id, &ctx.builder, &0_u32, &op);
327326

328327
let res = ctx
329328
.events
@@ -520,8 +519,7 @@ fn crowdfunding_claim_milestone_requires_admin_auth() {
520519
back(&ctx, id, &p, 200_0000000_i128);
521520

522521
let op = BytesN::random(&ctx.env);
523-
ctx.events
524-
.claim_milestone(&id, &ctx.builder, &0_u32, &op);
522+
ctx.events.claim_milestone(&id, &ctx.builder, &0_u32, &op);
525523

526524
let auths = ctx.env.auths();
527525
let admin_required = auths.iter().any(|(addr, _)| *addr == ctx.events_admin);

‎contracts/events/src/tests/escrow_fee_math.rs‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,8 @@ fn single_release_pays_full_escrow_for_100_percent() {
380380
];
381381
let op = BytesN::random(&ctx.env);
382382
ctx.events.select_winners(&id, &winners, &op);
383-
ctx.events.claim_prize(&id, &winner, &1_u32, &BytesN::random(&ctx.env));
383+
ctx.events
384+
.claim_prize(&id, &winner, &1_u32, &BytesN::random(&ctx.env));
384385

385386
let token = token::Client::new(&ctx.env, &ctx.token_addr);
386387
assert_eq!(token.balance(&winner), TOTAL_BUDGET);
@@ -422,9 +423,12 @@ fn multi_position_split_pays_correct_amounts() {
422423
];
423424
let op = BytesN::random(&ctx.env);
424425
ctx.events.select_winners(&id, &winners, &op);
425-
ctx.events.claim_prize(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
426-
ctx.events.claim_prize(&id, &w2, &2_u32, &BytesN::random(&ctx.env));
427-
ctx.events.claim_prize(&id, &w3, &3_u32, &BytesN::random(&ctx.env));
426+
ctx.events
427+
.claim_prize(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
428+
ctx.events
429+
.claim_prize(&id, &w2, &2_u32, &BytesN::random(&ctx.env));
430+
ctx.events
431+
.claim_prize(&id, &w3, &3_u32, &BytesN::random(&ctx.env));
428432

429433
let token = token::Client::new(&ctx.env, &ctx.token_addr);
430434
let escrow = TOTAL_BUDGET; // all positions filled at create time
@@ -469,9 +473,12 @@ fn three_way_33_33_34_split_rounding() {
469473
];
470474
let op = BytesN::random(&ctx.env);
471475
ctx.events.select_winners(&id, &winners, &op);
472-
ctx.events.claim_prize(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
473-
ctx.events.claim_prize(&id, &w2, &2_u32, &BytesN::random(&ctx.env));
474-
ctx.events.claim_prize(&id, &w3, &3_u32, &BytesN::random(&ctx.env));
476+
ctx.events
477+
.claim_prize(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
478+
ctx.events
479+
.claim_prize(&id, &w2, &2_u32, &BytesN::random(&ctx.env));
480+
ctx.events
481+
.claim_prize(&id, &w3, &3_u32, &BytesN::random(&ctx.env));
475482

476483
let token = token::Client::new(&ctx.env, &ctx.token_addr);
477484
let escrow = TOTAL_BUDGET;
@@ -503,7 +510,8 @@ fn partial_position_fill_leaves_residual_escrow() {
503510
];
504511
let op = BytesN::random(&ctx.env);
505512
ctx.events.select_winners(&id, &winners, &op);
506-
ctx.events.claim_prize(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
513+
ctx.events
514+
.claim_prize(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
507515

508516
let token = token::Client::new(&ctx.env, &ctx.token_addr);
509517
assert_eq!(token.balance(&w1), TOTAL_BUDGET * 60 / 100);
@@ -546,7 +554,8 @@ fn partner_funds_grow_winner_payout() {
546554
];
547555
let op = BytesN::random(&ctx.env);
548556
ctx.events.select_winners(&id, &winners, &op);
549-
ctx.events.claim_prize(&id, &winner, &1_u32, &BytesN::random(&ctx.env));
557+
ctx.events
558+
.claim_prize(&id, &winner, &1_u32, &BytesN::random(&ctx.env));
550559

551560
let token = token::Client::new(&ctx.env, &ctx.token_addr);
552561
assert_eq!(token.balance(&winner), escrow_at_select);
@@ -644,9 +653,7 @@ fn grant_milestone_out_of_range_rejected() {
644653
ctx.events.select_winners(&id, &winners, &op_sel);
645654

646655
let op = BytesN::random(&ctx.env);
647-
let res = ctx
648-
.events
649-
.try_claim_milestone(&id, &recipient, &2, &op);
656+
let res = ctx.events.try_claim_milestone(&id, &recipient, &2, &op);
650657
assert!(res.is_err(), "milestone >= total_milestones must revert");
651658
}
652659

@@ -1055,7 +1062,8 @@ fn fee_and_winner_balances_consistent() {
10551062
];
10561063
let op_sel = BytesN::random(&ctx.env);
10571064
ctx.events.select_winners(&id, &winners, &op_sel);
1058-
ctx.events.claim_prize(&id, &winner, &1_u32, &BytesN::random(&ctx.env));
1065+
ctx.events
1066+
.claim_prize(&id, &winner, &1_u32, &BytesN::random(&ctx.env));
10591067

10601068
assert_eq!(token.balance(&winner), escrow);
10611069
assert_eq!(token.balance(&ctx.fee_account), create_fee + contrib_fee);

‎contracts/events/src/tests/hackathon_pillar.rs‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,8 @@ fn select_winners_single_recipient_sweeps_escrow() {
308308

309309
// Pull-model: claim prize in winner's own transaction.
310310
let claim_op = BytesN::random(&ctx.env);
311-
ctx.events.claim_prize(&id, &ctx.applicant, &1_u32, &claim_op);
311+
ctx.events
312+
.claim_prize(&id, &ctx.applicant, &1_u32, &claim_op);
312313

313314
assert_eq!(token.balance(&ctx.applicant) - winner_before, TOTAL_BUDGET);
314315
assert_eq!(token.balance(&ctx.fee_account) - fee_before, 0);
@@ -373,9 +374,12 @@ fn select_winners_multi_position_splits_by_distribution() {
373374
let amt_2 = TOTAL_BUDGET * 30 / 100;
374375
let amt_3 = TOTAL_BUDGET * 20 / 100;
375376

376-
ctx.events.claim_prize(&id, &first, &1_u32, &BytesN::random(&ctx.env));
377-
ctx.events.claim_prize(&id, &second, &2_u32, &BytesN::random(&ctx.env));
378-
ctx.events.claim_prize(&id, &third, &3_u32, &BytesN::random(&ctx.env));
377+
ctx.events
378+
.claim_prize(&id, &first, &1_u32, &BytesN::random(&ctx.env));
379+
ctx.events
380+
.claim_prize(&id, &second, &2_u32, &BytesN::random(&ctx.env));
381+
ctx.events
382+
.claim_prize(&id, &third, &3_u32, &BytesN::random(&ctx.env));
379383

380384
assert_eq!(token.balance(&first), amt_1);
381385
assert_eq!(token.balance(&second), amt_2);
@@ -543,7 +547,8 @@ fn select_winners_on_completed_event_reverts() {
543547

544548
// Claim to drain escrow and complete the event.
545549
let claim_op = BytesN::random(&ctx.env);
546-
ctx.events.claim_prize(&id, &ctx.applicant, &1_u32, &claim_op);
550+
ctx.events
551+
.claim_prize(&id, &ctx.applicant, &1_u32, &claim_op);
547552
assert_eq!(ctx.events.get_event(&id).status, EventStatus::Completed);
548553

549554
let again = Address::generate(&ctx.env);

0 commit comments

Comments
 (0)