Skip to content

Commit 5d08c3e

Browse files
HaroldwonderHaroldwonder
committed
style: apply cargo fmt and refresh test snapshots
Fixes the failing Format check on PR #28. The rate-limiting feature's extra LastSubmitTime storage write also changes the resource footprint for existing submit_score tests, so their snapshots are regenerated too.
1 parent 6e85cd9 commit 5d08c3e

50 files changed

Lines changed: 17055 additions & 21 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎contracts/ledgerlens-score/src/events.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ pub fn cooldown_updated(env: &Env, cooldown_secs: u64) {
117117
/// cooldown for `(wallet, asset_pair)` — the emergency re-score path, not a
118118
/// routine operation, so this is worth a dedicated audit-trail event.
119119
pub fn rate_limit_overridden(env: &Env, by: &Address, wallet: &Address, asset_pair: &Symbol) {
120-
env.events().publish(
121-
(symbol_short!("rl_ovrd"), wallet.clone(), asset_pair.clone()),
122-
by.clone(),
123-
);
120+
env.events()
121+
.publish((symbol_short!("rl_ovrd"), wallet.clone(), asset_pair.clone()), by.clone());
124122
}

‎contracts/ledgerlens-score/src/test_rate_limit.rs‎

Lines changed: 66 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,17 @@ fn test_first_submit_always_accepted() {
6464
let wallet = Address::generate(&env);
6565
let pair = symbol_short!("XLM_USDC");
6666

67-
let result =
68-
client.try_submit_score(&Vec::new(&env), &wallet, &pair, &50, &false, &false, &START_TS, &90, &1);
67+
let result = client.try_submit_score(
68+
&Vec::new(&env),
69+
&wallet,
70+
&pair,
71+
&50,
72+
&false,
73+
&false,
74+
&START_TS,
75+
&90,
76+
&1,
77+
);
6978
assert!(result.is_ok());
7079
assert_eq!(client.get_last_submit_time(&wallet, &pair), START_TS);
7180
}
@@ -79,8 +88,17 @@ fn test_second_submit_within_cooldown_rejected() {
7988
client.submit_score(&Vec::new(&env), &wallet, &pair, &50, &false, &false, &START_TS, &90, &1);
8089

8190
advance_to(&env, START_TS + DEFAULT_COOLDOWN_SECS - 1);
82-
let result =
83-
client.try_submit_score(&Vec::new(&env), &wallet, &pair, &60, &false, &false, &START_TS, &90, &1);
91+
let result = client.try_submit_score(
92+
&Vec::new(&env),
93+
&wallet,
94+
&pair,
95+
&60,
96+
&false,
97+
&false,
98+
&START_TS,
99+
&90,
100+
&1,
101+
);
84102
assert_eq!(result, Err(Ok(Error::RateLimitExceeded)));
85103

86104
// The rejected submission must not have overwritten the stored score.
@@ -110,8 +128,17 @@ fn test_cooldown_exactly_at_boundary() {
110128

111129
// now == last_submit + cooldown exactly — must be accepted (strict `<` rejects).
112130
advance_to(&env, START_TS + DEFAULT_COOLDOWN_SECS);
113-
let result =
114-
client.try_submit_score(&Vec::new(&env), &wallet, &pair, &60, &false, &false, &START_TS, &90, &1);
131+
let result = client.try_submit_score(
132+
&Vec::new(&env),
133+
&wallet,
134+
&pair,
135+
&60,
136+
&false,
137+
&false,
138+
&START_TS,
139+
&90,
140+
&1,
141+
);
115142
assert!(result.is_ok());
116143
assert_eq!(client.get_score(&wallet, &pair).score, 60);
117144
}
@@ -125,7 +152,17 @@ fn test_batch_rate_limited_entry_skipped() {
125152
let fresh_wallet = Address::generate(&env);
126153
let pair = symbol_short!("XLM_USDC");
127154

128-
client.submit_score(&Vec::new(&env), &limited_wallet, &pair, &10, &false, &false, &START_TS, &50, &1);
155+
client.submit_score(
156+
&Vec::new(&env),
157+
&limited_wallet,
158+
&pair,
159+
&10,
160+
&false,
161+
&false,
162+
&START_TS,
163+
&50,
164+
&1,
165+
);
129166

130167
advance_to(&env, START_TS + 10); // still well within the default cooldown
131168

@@ -280,8 +317,17 @@ fn test_cooldown_is_per_pair() {
280317
client.submit_score(&Vec::new(&env), &wallet, &pair_a, &50, &false, &false, &START_TS, &90, &1);
281318

282319
// Still within pair_a's cooldown, but pair_b has never been submitted.
283-
let result =
284-
client.try_submit_score(&Vec::new(&env), &wallet, &pair_b, &60, &false, &false, &START_TS, &90, &1);
320+
let result = client.try_submit_score(
321+
&Vec::new(&env),
322+
&wallet,
323+
&pair_b,
324+
&60,
325+
&false,
326+
&false,
327+
&START_TS,
328+
&90,
329+
&1,
330+
);
285331
assert!(result.is_ok());
286332
}
287333

@@ -294,7 +340,16 @@ fn test_cooldown_is_per_wallet() {
294340

295341
client.submit_score(&Vec::new(&env), &wallet_a, &pair, &50, &false, &false, &START_TS, &90, &1);
296342

297-
let result =
298-
client.try_submit_score(&Vec::new(&env), &wallet_b, &pair, &60, &false, &false, &START_TS, &90, &1);
343+
let result = client.try_submit_score(
344+
&Vec::new(&env),
345+
&wallet_b,
346+
&pair,
347+
&60,
348+
&false,
349+
&false,
350+
&START_TS,
351+
&90,
352+
&1,
353+
);
299354
assert!(result.is_ok());
300355
}

‎contracts/ledgerlens-score/test_snapshots/test/test_1_of_1_behaves_like_original.1.json‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,57 @@
253253
777600
254254
]
255255
],
256+
[
257+
{
258+
"contract_data": {
259+
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
260+
"key": {
261+
"vec": [
262+
{
263+
"symbol": "LastSubmitTime"
264+
},
265+
{
266+
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
267+
},
268+
{
269+
"symbol": "XLM_USDC"
270+
}
271+
]
272+
},
273+
"durability": "persistent"
274+
}
275+
},
276+
[
277+
{
278+
"last_modified_ledger_seq": 0,
279+
"data": {
280+
"contract_data": {
281+
"ext": "v0",
282+
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
283+
"key": {
284+
"vec": [
285+
{
286+
"symbol": "LastSubmitTime"
287+
},
288+
{
289+
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
290+
},
291+
{
292+
"symbol": "XLM_USDC"
293+
}
294+
]
295+
},
296+
"durability": "persistent",
297+
"val": {
298+
"u64": 0
299+
}
300+
}
301+
},
302+
"ext": "v0"
303+
},
304+
777600
305+
]
306+
],
256307
[
257308
{
258309
"contract_data": {

‎contracts/ledgerlens-score/test_snapshots/test/test_aggregate_equal_weights.1.json‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,159 @@
303303
777600
304304
]
305305
],
306+
[
307+
{
308+
"contract_data": {
309+
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
310+
"key": {
311+
"vec": [
312+
{
313+
"symbol": "LastSubmitTime"
314+
},
315+
{
316+
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
317+
},
318+
{
319+
"symbol": "XLM_BTC"
320+
}
321+
]
322+
},
323+
"durability": "persistent"
324+
}
325+
},
326+
[
327+
{
328+
"last_modified_ledger_seq": 0,
329+
"data": {
330+
"contract_data": {
331+
"ext": "v0",
332+
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
333+
"key": {
334+
"vec": [
335+
{
336+
"symbol": "LastSubmitTime"
337+
},
338+
{
339+
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
340+
},
341+
{
342+
"symbol": "XLM_BTC"
343+
}
344+
]
345+
},
346+
"durability": "persistent",
347+
"val": {
348+
"u64": 0
349+
}
350+
}
351+
},
352+
"ext": "v0"
353+
},
354+
777600
355+
]
356+
],
357+
[
358+
{
359+
"contract_data": {
360+
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
361+
"key": {
362+
"vec": [
363+
{
364+
"symbol": "LastSubmitTime"
365+
},
366+
{
367+
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
368+
},
369+
{
370+
"symbol": "XLM_ETH"
371+
}
372+
]
373+
},
374+
"durability": "persistent"
375+
}
376+
},
377+
[
378+
{
379+
"last_modified_ledger_seq": 0,
380+
"data": {
381+
"contract_data": {
382+
"ext": "v0",
383+
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
384+
"key": {
385+
"vec": [
386+
{
387+
"symbol": "LastSubmitTime"
388+
},
389+
{
390+
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
391+
},
392+
{
393+
"symbol": "XLM_ETH"
394+
}
395+
]
396+
},
397+
"durability": "persistent",
398+
"val": {
399+
"u64": 0
400+
}
401+
}
402+
},
403+
"ext": "v0"
404+
},
405+
777600
406+
]
407+
],
408+
[
409+
{
410+
"contract_data": {
411+
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
412+
"key": {
413+
"vec": [
414+
{
415+
"symbol": "LastSubmitTime"
416+
},
417+
{
418+
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
419+
},
420+
{
421+
"symbol": "XLM_USDC"
422+
}
423+
]
424+
},
425+
"durability": "persistent"
426+
}
427+
},
428+
[
429+
{
430+
"last_modified_ledger_seq": 0,
431+
"data": {
432+
"contract_data": {
433+
"ext": "v0",
434+
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
435+
"key": {
436+
"vec": [
437+
{
438+
"symbol": "LastSubmitTime"
439+
},
440+
{
441+
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
442+
},
443+
{
444+
"symbol": "XLM_USDC"
445+
}
446+
]
447+
},
448+
"durability": "persistent",
449+
"val": {
450+
"u64": 0
451+
}
452+
}
453+
},
454+
"ext": "v0"
455+
},
456+
777600
457+
]
458+
],
306459
[
307460
{
308461
"contract_data": {

0 commit comments

Comments
 (0)