Skip to content

Commit f40f043

Browse files
committed
style: apply cargo fmt formatting
1 parent d45dc2e commit f40f043

3 files changed

Lines changed: 48 additions & 29 deletions

File tree

contracts/stream_contract/src/lib.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ use storage::{
4848
config_exists, load_config, load_stream, next_stream_id, save_config, save_stream,
4949
try_load_config, try_load_stream,
5050
};
51-
use types::{BatchStreamInput, DisputeInitiatedData, DisputeState, ProtocolConfig, Stream, StreamStatus};
51+
use types::{
52+
BatchStreamInput, DisputeInitiatedData, DisputeState, ProtocolConfig, Stream, StreamStatus,
53+
};
5254

5355
/// Maximum allowed protocol fee: 1 000 bps = 10%.
5456
const MAX_FEE_RATE_BPS: u32 = 1_000;
@@ -1047,11 +1049,7 @@ impl StreamContract {
10471049
/// - `StreamNotActive` — stream is inactive.
10481050
/// - `NoArbiterConfigured` — stream has no arbiter.
10491051
/// - `DisputeAlreadyActive` — a dispute is already in progress.
1050-
pub fn initiate_dispute(
1051-
env: Env,
1052-
caller: Address,
1053-
stream_id: u64,
1054-
) -> Result<(), StreamError> {
1052+
pub fn initiate_dispute(env: Env, caller: Address, stream_id: u64) -> Result<(), StreamError> {
10551053
caller.require_auth();
10561054

10571055
let mut stream = load_stream(&env, stream_id)?;

contracts/stream_contract/src/test.rs

Lines changed: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3154,15 +3154,14 @@ fn test_initiate_dispute_by_sender_succeeds() {
31543154
let arbiter = Address::generate(&env);
31553155
let client = create_contract(&env);
31563156

3157-
let id = create_escrow_stream(&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100);
3157+
let id = create_escrow_stream(
3158+
&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100,
3159+
);
31583160

31593161
client.initiate_dispute(&sender, &id);
31603162

31613163
let stream = client.get_stream(&id).unwrap();
3162-
assert!(matches!(
3163-
stream.dispute_state,
3164-
DisputeState::Initiated(_)
3165-
));
3164+
assert!(matches!(stream.dispute_state, DisputeState::Initiated(_)));
31663165
assert!(stream.paused);
31673166
assert_eq!(stream.status, StreamStatus::Paused);
31683167
}
@@ -3178,15 +3177,14 @@ fn test_initiate_dispute_by_recipient_succeeds() {
31783177
let arbiter = Address::generate(&env);
31793178
let client = create_contract(&env);
31803179

3181-
let id = create_escrow_stream(&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100);
3180+
let id = create_escrow_stream(
3181+
&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100,
3182+
);
31823183

31833184
client.initiate_dispute(&recipient, &id);
31843185

31853186
let stream = client.get_stream(&id).unwrap();
3186-
assert!(matches!(
3187-
stream.dispute_state,
3188-
DisputeState::Initiated(_)
3189-
));
3187+
assert!(matches!(stream.dispute_state, DisputeState::Initiated(_)));
31903188
}
31913189

31923190
#[test]
@@ -3201,7 +3199,9 @@ fn test_initiate_dispute_unauthorized_caller_fails() {
32013199
let stranger = Address::generate(&env);
32023200
let client = create_contract(&env);
32033201

3204-
let id = create_escrow_stream(&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100);
3202+
let id = create_escrow_stream(
3203+
&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100,
3204+
);
32053205

32063206
assert_eq!(
32073207
client.try_initiate_dispute(&stranger, &id),
@@ -3239,7 +3239,9 @@ fn test_initiate_dispute_already_active_fails() {
32393239
let arbiter = Address::generate(&env);
32403240
let client = create_contract(&env);
32413241

3242-
let id = create_escrow_stream(&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100);
3242+
let id = create_escrow_stream(
3243+
&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100,
3244+
);
32433245

32443246
client.initiate_dispute(&sender, &id);
32453247

@@ -3275,7 +3277,9 @@ fn test_initiate_dispute_emits_event() {
32753277
let arbiter = Address::generate(&env);
32763278
let client = create_contract(&env);
32773279

3278-
let id = create_escrow_stream(&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100);
3280+
let id = create_escrow_stream(
3281+
&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100,
3282+
);
32793283

32803284
client.initiate_dispute(&sender, &id);
32813285

@@ -3312,7 +3316,9 @@ fn test_resolve_dispute_arbiter_splits_funds() {
33123316
let arbiter = Address::generate(&env);
33133317
let client = create_contract(&env);
33143318

3315-
let id = create_escrow_stream(&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100);
3319+
let id = create_escrow_stream(
3320+
&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100,
3321+
);
33163322

33173323
client.initiate_dispute(&sender, &id);
33183324

@@ -3340,7 +3346,9 @@ fn test_resolve_dispute_full_to_sender() {
33403346
let arbiter = Address::generate(&env);
33413347
let client = create_contract(&env);
33423348

3343-
let id = create_escrow_stream(&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100);
3349+
let id = create_escrow_stream(
3350+
&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100,
3351+
);
33443352
client.initiate_dispute(&sender, &id);
33453353
client.resolve_dispute(&arbiter, &id, &10_000, &0);
33463354

@@ -3360,7 +3368,9 @@ fn test_resolve_dispute_full_to_recipient() {
33603368
let arbiter = Address::generate(&env);
33613369
let client = create_contract(&env);
33623370

3363-
let id = create_escrow_stream(&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100);
3371+
let id = create_escrow_stream(
3372+
&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100,
3373+
);
33643374
client.initiate_dispute(&sender, &id);
33653375
client.resolve_dispute(&arbiter, &id, &0, &10_000);
33663376

@@ -3381,7 +3391,9 @@ fn test_resolve_dispute_unauthorized_non_arbiter_fails() {
33813391
let stranger = Address::generate(&env);
33823392
let client = create_contract(&env);
33833393

3384-
let id = create_escrow_stream(&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100);
3394+
let id = create_escrow_stream(
3395+
&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100,
3396+
);
33853397
client.initiate_dispute(&sender, &id);
33863398

33873399
assert_eq!(
@@ -3401,7 +3413,9 @@ fn test_resolve_dispute_no_active_dispute_fails() {
34013413
let arbiter = Address::generate(&env);
34023414
let client = create_contract(&env);
34033415

3404-
let id = create_escrow_stream(&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100);
3416+
let id = create_escrow_stream(
3417+
&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100,
3418+
);
34053419

34063420
// No dispute initiated — resolve should fail.
34073421
assert_eq!(
@@ -3421,7 +3435,9 @@ fn test_resolve_dispute_invalid_split_fails() {
34213435
let arbiter = Address::generate(&env);
34223436
let client = create_contract(&env);
34233437

3424-
let id = create_escrow_stream(&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100);
3438+
let id = create_escrow_stream(
3439+
&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100,
3440+
);
34253441
client.initiate_dispute(&sender, &id);
34263442

34273443
// 6_000 + 3_000 = 9_000 ≠ 10_000 remaining → invalid.
@@ -3442,7 +3458,9 @@ fn test_resolve_dispute_negative_payout_fails() {
34423458
let arbiter = Address::generate(&env);
34433459
let client = create_contract(&env);
34443460

3445-
let id = create_escrow_stream(&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100);
3461+
let id = create_escrow_stream(
3462+
&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100,
3463+
);
34463464
client.initiate_dispute(&sender, &id);
34473465

34483466
assert_eq!(
@@ -3462,7 +3480,9 @@ fn test_resolve_dispute_emits_event() {
34623480
let arbiter = Address::generate(&env);
34633481
let client = create_contract(&env);
34643482

3465-
let id = create_escrow_stream(&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100);
3483+
let id = create_escrow_stream(
3484+
&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100,
3485+
);
34663486
client.initiate_dispute(&sender, &id);
34673487
client.resolve_dispute(&arbiter, &id, &7_000, &3_000);
34683488

@@ -3501,7 +3521,9 @@ fn test_cancel_blocked_during_active_dispute() {
35013521
let arbiter = Address::generate(&env);
35023522
let client = create_contract(&env);
35033523

3504-
let id = create_escrow_stream(&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100);
3524+
let id = create_escrow_stream(
3525+
&env, &client, &sender, &recipient, &token, &arbiter, 10_000, 100,
3526+
);
35053527
client.initiate_dispute(&sender, &id);
35063528

35073529
// Unilateral cancel must be blocked while dispute is active.

contracts/stream_contract/src/types.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ pub enum DisputeState {
2323
Resolved,
2424
}
2525

26-
2726
/// Status of a payment stream.
2827
#[contracttype]
2928
#[derive(Clone, Debug, Eq, PartialEq)]

0 commit comments

Comments
 (0)