Skip to content

Commit 6ee9d6b

Browse files
Chucks1093Chucks1093
authored
Merge pull request #821 from Seunfunmi-319509/fix/cargo-fmt-main
style: run cargo fmt across workspace to satisfy format check
2 parents 19fea3f + 00dee86 commit 6ee9d6b

9 files changed

Lines changed: 104 additions & 27 deletions

‎creator-keys/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3352,7 +3352,7 @@ impl CreatorKeysContract {
33523352
let max_allowed = ((i128::from(post_buy_supply) * i128::from(cap_bps))
33533353
/ i128::from(fee::BPS_MAX)) as u32;
33543354
if post_buy_balance > max_allowed {
3355-
return Err(ContractError::WalletCapExceeded);
3355+
return Err(ContractError::MaxHoldingExceeded);
33563356
}
33573357
}
33583358
}
@@ -5887,7 +5887,7 @@ impl CreatorKeysContract {
58875887
creator.require_auth();
58885888
let resolved_bps = cap_bps.unwrap_or(DEFAULT_HOLDER_CAP_BPS);
58895889
if !(HOLDER_CAP_MIN_BPS..=HOLDER_CAP_MAX_BPS).contains(&resolved_bps) {
5890-
return Err(ContractError::WalletCapExceeded);
5890+
return Err(ContractError::InvalidHolderCap);
58915891
}
58925892
let key = constants::storage::holder_cap_bps(&creator);
58935893
env.storage().persistent().set(&key, &resolved_bps);

‎creator-keys/src/test_issues.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,10 @@ mod issue_tests {
282282
client.buy_key(&creator, &buyer, &KEY_PRICE, &None);
283283
}
284284

285+
// Advance ledger so sells are in a different ledger from the last buy
286+
// (required by the flash-loan guard).
287+
env.ledger().with_mut(|l| l.sequence_number += 1);
288+
285289
assert_supply_equals_holder_sum(
286290
&env,
287291
&client,

‎creator-keys/test_snapshots/test_issues/issue_tests/test_invariant_after_sell.1.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@
462462
],
463463
"ledger": {
464464
"protocol_version": 22,
465-
"sequence_number": 1,
465+
"sequence_number": 2,
466466
"timestamp": 0,
467467
"network_id": "0000000000000000000000000000000000000000000000000000000000000000",
468468
"base_reserve": 0,
@@ -645,13 +645,13 @@
645645
},
646646
"durability": "persistent",
647647
"val": {
648-
"u32": 6311521
648+
"u32": 6311522
649649
}
650650
}
651651
},
652652
"ext": "v0"
653653
},
654-
6311521
654+
6311522
655655
]
656656
],
657657
[
@@ -750,7 +750,7 @@
750750
},
751751
"ext": "v0"
752752
},
753-
6311521
753+
6311522
754754
]
755755
],
756756
[
@@ -804,7 +804,7 @@
804804
},
805805
"ext": "v0"
806806
},
807-
6311521
807+
6311522
808808
]
809809
],
810810
[
@@ -855,7 +855,7 @@
855855
},
856856
"ext": "v0"
857857
},
858-
6311521
858+
6311522
859859
]
860860
],
861861
[
@@ -1229,7 +1229,7 @@
12291229
},
12301230
"ext": "v0"
12311231
},
1232-
6312000
1232+
6312001
12331233
]
12341234
],
12351235
[
@@ -1295,7 +1295,7 @@
12951295
},
12961296
"ext": "v0"
12971297
},
1298-
6312000
1298+
6312001
12991299
]
13001300
],
13011301
[
@@ -1493,7 +1493,7 @@
14931493
},
14941494
"ext": "v0"
14951495
},
1496-
6312000
1496+
6312001
14971497
]
14981498
],
14991499
[
@@ -1526,7 +1526,7 @@
15261526
},
15271527
"ext": "v0"
15281528
},
1529-
6312000
1529+
6312001
15301530
]
15311531
],
15321532
[

‎creator-keys/test_snapshots/test_sell_slippage_succeeds_when_proceeds_meet_or_exceed_min_proceeds.1.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1540,7 +1540,7 @@
15401540
"symbol": "ledger"
15411541
},
15421542
"val": {
1543-
"u32": 0
1543+
"u32": 2
15441544
}
15451545
}
15461546
]

‎creator-keys/test_snapshots/test_sell_succeeds_when_min_proceeds_equals_actual_proceeds.1.json‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,6 +1204,68 @@
12041204
]
12051205
},
12061206
"events": [
1207+
{
1208+
"event": {
1209+
"ext": "v0",
1210+
"contract_id": "0000000000000000000000000000000000000000000000000000000000000001",
1211+
"type_": "contract",
1212+
"body": {
1213+
"v0": {
1214+
"topics": [
1215+
{
1216+
"symbol": "slp_ok"
1217+
},
1218+
{
1219+
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
1220+
}
1221+
],
1222+
"data": {
1223+
"map": [
1224+
{
1225+
"key": {
1226+
"symbol": "actual_amount"
1227+
},
1228+
"val": {
1229+
"i128": {
1230+
"hi": 0,
1231+
"lo": 0
1232+
}
1233+
}
1234+
},
1235+
{
1236+
"key": {
1237+
"symbol": "bound"
1238+
},
1239+
"val": {
1240+
"i128": {
1241+
"hi": 0,
1242+
"lo": 0
1243+
}
1244+
}
1245+
},
1246+
{
1247+
"key": {
1248+
"symbol": "creator_id"
1249+
},
1250+
"val": {
1251+
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
1252+
}
1253+
},
1254+
{
1255+
"key": {
1256+
"symbol": "ledger"
1257+
},
1258+
"val": {
1259+
"u32": 1
1260+
}
1261+
}
1262+
]
1263+
}
1264+
}
1265+
}
1266+
},
1267+
"failed_call": false
1268+
},
12071269
{
12081270
"event": {
12091271
"ext": "v0",

‎creator-keys/test_snapshots/test_sell_updates_creator_supply_and_seller_balance_atomically.1.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
],
263263
"ledger": {
264264
"protocol_version": 22,
265-
"sequence_number": 1,
265+
"sequence_number": 2,
266266
"timestamp": 0,
267267
"network_id": "0000000000000000000000000000000000000000000000000000000000000000",
268268
"base_reserve": 0,
@@ -493,7 +493,7 @@
493493
},
494494
"ext": "v0"
495495
},
496-
6311521
496+
6311522
497497
]
498498
],
499499
[
@@ -532,13 +532,13 @@
532532
},
533533
"durability": "persistent",
534534
"val": {
535-
"u32": 6311521
535+
"u32": 6311522
536536
}
537537
}
538538
},
539539
"ext": "v0"
540540
},
541-
6311521
541+
6311522
542542
]
543543
],
544544
[
@@ -693,7 +693,7 @@
693693
},
694694
"ext": "v0"
695695
},
696-
6311521
696+
6311522
697697
]
698698
],
699699
[
@@ -747,7 +747,7 @@
747747
},
748748
"ext": "v0"
749749
},
750-
6311521
750+
6311522
751751
]
752752
],
753753
[
@@ -798,7 +798,7 @@
798798
},
799799
"ext": "v0"
800800
},
801-
6311521
801+
6311522
802802
]
803803
],
804804
[
@@ -1088,7 +1088,7 @@
10881088
},
10891089
"ext": "v0"
10901090
},
1091-
6311521
1091+
6311522
10921092
]
10931093
],
10941094
[
@@ -1130,7 +1130,7 @@
11301130
},
11311131
"ext": "v0"
11321132
},
1133-
6311521
1133+
6311522
11341134
]
11351135
],
11361136
[
@@ -1393,7 +1393,7 @@
13931393
},
13941394
"ext": "v0"
13951395
},
1396-
6312000
1396+
6312001
13971397
]
13981398
],
13991399
[
@@ -1426,7 +1426,7 @@
14261426
},
14271427
"ext": "v0"
14281428
},
1429-
6312000
1429+
6312001
14301430
]
14311431
],
14321432
[

‎creator-keys/tests/global_emergency_pause.rs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,14 @@ fn test_global_resume_with_two_approvals_lifts_halt() {
189189
let events = env.events().all();
190190
assert!(!f.client.get_global_trading_paused());
191191

192+
// Check the captured log: a view call above resets the harness's visible
193+
// event buffer, so a fresh `env.events().all()` here would be empty.
194+
assert!(events.iter().any(|(_, topics, _)| {
195+
topics.get(0).map(|topic| {
196+
let name: soroban_sdk::Symbol = topic.into_val(&env);
197+
name == GLOBAL_PAUSE_LIFTED_EVENT_NAME
198+
}) == Some(true)
199+
}));
192200
let (_, data) = events
193201
.iter()
194202
.rev()

‎creator-keys/tests/holder_cap.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fn test_buy_pushing_holder_above_cap_panics() {
5757
let result = client.try_buy_key(&creator, &buyer, &KEY_PRICE, &None);
5858
assert_eq!(
5959
result,
60-
Err(Ok(ContractError::WalletCapExceeded)),
60+
Err(Ok(ContractError::MaxHoldingExceeded)),
6161
"a buy past 10% of supply must be rejected"
6262
);
6363
assert_eq!(client.get_key_balance(&creator, &buyer), 2);
@@ -118,10 +118,10 @@ fn test_set_holder_cap_rejects_values_outside_one_and_twenty_five_percent() {
118118
let (client, creator) = setup(&env);
119119

120120
let too_small = client.try_set_holder_cap(&creator, &Some(99));
121-
assert_eq!(too_small, Err(Ok(ContractError::WalletCapExceeded)));
121+
assert_eq!(too_small, Err(Ok(ContractError::InvalidHolderCap)));
122122

123123
let too_large = client.try_set_holder_cap(&creator, &Some(2501));
124-
assert_eq!(too_large, Err(Ok(ContractError::WalletCapExceeded)));
124+
assert_eq!(too_large, Err(Ok(ContractError::InvalidHolderCap)));
125125

126126
assert_eq!(client.get_holder_cap(&creator), None);
127127
}

‎creator-keys/tests/resolve_issues_tests.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,9 @@ fn test_sell_updates_creator_supply_and_seller_balance_atomically() {
275275
assert_eq!(client.get_total_key_supply(&creator), 3);
276276
assert_eq!(client.get_key_balance(&creator, &seller), 3);
277277

278+
// Advance the ledger so the sells are not blocked by the flash-loan guard.
279+
env.ledger().with_mut(|l| l.sequence_number += 1);
280+
278281
// Execute a sell of 2 keys
279282
let mut l = env.ledger().get();
280283
l.sequence_number += 1;

0 commit comments

Comments
 (0)