Skip to content

Commit 5553bc0

Browse files
committed
style: cargo fmt all new and modified files
1 parent 2c717a1 commit 5553bc0

10 files changed

Lines changed: 93 additions & 98 deletions

File tree

crates/aegis-core/benches/explain.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use criterion::{Criterion, black_box, criterion_group, criterion_main};
22

33
use aegis_core::engine::GraphEngine;
4-
use aegis_core::storage::sqlite::{SqliteConfig, SqliteStorage};
54
use aegis_core::storage::StorageBackend;
5+
use aegis_core::storage::sqlite::{SqliteConfig, SqliteStorage};
66
use aegis_core::types::schema::{PermissionDef, RelationDef, Schema, TypeDef};
77
use aegis_core::types::*;
88
use std::collections::HashMap;

crates/aegis-core/benches/memory.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use criterion::{Criterion, black_box, criterion_group, criterion_main};
22

33
use aegis_core::engine::GraphEngine;
4-
use aegis_core::storage::sqlite::{SqliteConfig, SqliteStorage};
54
use aegis_core::storage::StorageBackend;
5+
use aegis_core::storage::sqlite::{SqliteConfig, SqliteStorage};
66
use aegis_core::types::schema::{PermissionDef, RelationDef, Schema, TypeDef};
77
use aegis_core::types::*;
88
use std::collections::HashMap;
@@ -12,13 +12,7 @@ fn current_rss_kb() -> u64 {
1212
{
1313
let pid = std::process::id();
1414
let output = std::process::Command::new("tasklist")
15-
.args([
16-
"/FI",
17-
&format!("PID eq {}", pid),
18-
"/FO",
19-
"CSV",
20-
"/NH",
21-
])
15+
.args(["/FI", &format!("PID eq {}", pid), "/FO", "CSV", "/NH"])
2216
.output()
2317
.expect("tasklist failed");
2418
let stdout = String::from_utf8(output.stdout).expect("invalid utf8");

crates/aegis-core/benches/write.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use criterion::{Criterion, black_box, criterion_group, criterion_main};
22

33
use aegis_core::engine::GraphEngine;
4-
use aegis_core::storage::sqlite::{SqliteConfig, SqliteStorage};
54
use aegis_core::storage::StorageBackend;
5+
use aegis_core::storage::sqlite::{SqliteConfig, SqliteStorage};
66
use aegis_core::types::schema::{PermissionDef, RelationDef, Schema, TypeDef};
77
use aegis_core::types::*;
88
use std::collections::HashMap;

crates/aegis-core/src/engine/cache.rs

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,22 @@ mod tests {
399399
#[test]
400400
fn test_cache_invalidate_before() {
401401
let mut cache = DecisionCache::new(100);
402-
cache.insert("user:1", "read", "repo:a", "default", true, Revision::new(5));
403-
cache.insert("user:2", "read", "repo:b", "default", true, Revision::new(10));
402+
cache.insert(
403+
"user:1",
404+
"read",
405+
"repo:a",
406+
"default",
407+
true,
408+
Revision::new(5),
409+
);
410+
cache.insert(
411+
"user:2",
412+
"read",
413+
"repo:b",
414+
"default",
415+
true,
416+
Revision::new(10),
417+
);
404418

405419
cache.invalidate_before(Revision::new(8));
406420

@@ -426,10 +440,7 @@ mod tests {
426440
Revision::new(5),
427441
);
428442
cache.clear();
429-
assert_eq!(
430-
cache.get("user:1", "owner", Revision::new(5)),
431-
None
432-
);
443+
assert_eq!(cache.get("user:1", "owner", Revision::new(5)), None);
433444
}
434445

435446
#[test]
@@ -450,10 +461,7 @@ mod tests {
450461

451462
cache.invalidate_before(Revision::new(8));
452463

453-
assert_eq!(
454-
cache.get("user:1", "owner", Revision::new(5)),
455-
None
456-
);
464+
assert_eq!(cache.get("user:1", "owner", Revision::new(5)), None);
457465
assert_eq!(
458466
cache.get("user:2", "owner", Revision::new(10)),
459467
Some(vec!["repo:b".to_string()])

crates/aegis-core/src/engine/watch.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -547,12 +547,10 @@ mod tests {
547547
assert!(last_rev.as_u64() > 5, "need revision > 5 for test setup");
548548

549549
// Now subscribe with since_revision=5
550-
let since_sub = engine.watch(
551-
WatchFilter {
552-
since_revision: Some(Revision::new(5)),
553-
..Default::default()
554-
},
555-
);
550+
let since_sub = engine.watch(WatchFilter {
551+
since_revision: Some(Revision::new(5)),
552+
..Default::default()
553+
});
556554

557555
// Write another tuple — revision will be > 5
558556
let token = engine

crates/aegis-core/src/storage/sqlite.rs

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3139,13 +3139,21 @@ mod tests {
31393139
fn test_audit_entry_has_timestamp() {
31403140
let mut store = storage();
31413141
store.initialize().unwrap();
3142-
store.write_tuple(&PartitionId::default(), &tuple("user:ts", "owner", "repo:ts")).unwrap();
3143-
let entries = store.query_audit(
3144-
&PartitionId::default(),
3145-
Some(&ResourceId::new("repo:ts").unwrap()),
3146-
None, None,
3147-
&PaginationParams::default(),
3148-
).unwrap();
3142+
store
3143+
.write_tuple(
3144+
&PartitionId::default(),
3145+
&tuple("user:ts", "owner", "repo:ts"),
3146+
)
3147+
.unwrap();
3148+
let entries = store
3149+
.query_audit(
3150+
&PartitionId::default(),
3151+
Some(&ResourceId::new("repo:ts").unwrap()),
3152+
None,
3153+
None,
3154+
&PaginationParams::default(),
3155+
)
3156+
.unwrap();
31493157
assert_eq!(entries.len(), 1);
31503158
assert!(entries[0].timestamp.timestamp() > 0);
31513159
}

crates/aegis-core/tests/multitenancy.rs

Lines changed: 13 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,11 @@ fn test_tenant_isolation_write_read() {
8686
))
8787
.unwrap();
8888

89-
let result = engine_a
90-
.check(&subject, "read", &resource, None)
91-
.unwrap();
89+
let result = engine_a.check(&subject, "read", &resource, None).unwrap();
9290
assert!(result.allowed, "tenant_a should read its own tuple");
9391

94-
let result = engine_b
95-
.check(&subject, "read", &resource, None)
96-
.unwrap();
97-
assert!(
98-
!result.allowed,
99-
"tenant_b should not read tenant_a's tuple"
100-
);
92+
let result = engine_b.check(&subject, "read", &resource, None).unwrap();
93+
assert!(!result.allowed, "tenant_b should not read tenant_a's tuple");
10194

10295
engine_a.close().unwrap();
10396
engine_b.close().unwrap();
@@ -188,17 +181,10 @@ fn test_tenant_admin_cannot_access_other_tenant() {
188181
))
189182
.unwrap();
190183

191-
let result = engine_a
192-
.check(&admin_a, "read", &resource_a, None)
193-
.unwrap();
194-
assert!(
195-
result.allowed,
196-
"admin_tenant_a should access tenant_a data"
197-
);
184+
let result = engine_a.check(&admin_a, "read", &resource_a, None).unwrap();
185+
assert!(result.allowed, "admin_tenant_a should access tenant_a data");
198186

199-
let result = engine_b
200-
.check(&admin_a, "read", &resource_b, None)
201-
.unwrap();
187+
let result = engine_b.check(&admin_a, "read", &resource_b, None).unwrap();
202188
assert!(
203189
!result.allowed,
204190
"admin_tenant_a should not access tenant_b data"
@@ -277,10 +263,7 @@ types:
277263
let result = engine
278264
.check(&super_admin, "read", &resource_a, None)
279265
.unwrap();
280-
assert!(
281-
result.allowed,
282-
"super:admin should read tenant_a resource"
283-
);
266+
assert!(result.allowed, "super:admin should read tenant_a resource");
284267

285268
let result = engine
286269
.check(&super_admin, "read", &resource_b, None)
@@ -354,11 +337,7 @@ types:
354337
let result = engine
355338
.query(&filter, &PaginationParams::new(100, None), None)
356339
.unwrap();
357-
assert_eq!(
358-
result.tuples.len(),
359-
5,
360-
"should get exactly 5 repo tuples"
361-
);
340+
assert_eq!(result.tuples.len(), 5, "should get exactly 5 repo tuples");
362341
for t in &result.tuples {
363342
assert!(
364343
t.object.as_str().starts_with("repo:"),
@@ -374,11 +353,7 @@ types:
374353
let result = engine
375354
.query(&filter, &PaginationParams::new(100, None), None)
376355
.unwrap();
377-
assert_eq!(
378-
result.tuples.len(),
379-
5,
380-
"should get exactly 5 doc tuples"
381-
);
356+
assert_eq!(result.tuples.len(), 5, "should get exactly 5 doc tuples");
382357
for t in &result.tuples {
383358
assert!(
384359
t.object.as_str().starts_with("doc:"),
@@ -403,8 +378,7 @@ fn test_concurrent_tenant_operations() {
403378
std::thread::spawn(move || {
404379
for i in 0..20 {
405380
let subject = SubjectId::new(format!("user:a{}", i)).unwrap();
406-
let resource =
407-
ResourceId::new(format!("tenant_a_repo:r{}", i)).unwrap();
381+
let resource = ResourceId::new(format!("tenant_a_repo:r{}", i)).unwrap();
408382
engine
409383
.write(&RelationshipTuple::new(
410384
subject,
@@ -421,8 +395,7 @@ fn test_concurrent_tenant_operations() {
421395
std::thread::spawn(move || {
422396
for i in 0..20 {
423397
let subject = SubjectId::new(format!("user:b{}", i)).unwrap();
424-
let resource =
425-
ResourceId::new(format!("tenant_b_repo:r{}", i)).unwrap();
398+
let resource = ResourceId::new(format!("tenant_b_repo:r{}", i)).unwrap();
426399
engine
427400
.write(&RelationshipTuple::new(
428401
subject,
@@ -444,11 +417,7 @@ fn test_concurrent_tenant_operations() {
444417
None,
445418
)
446419
.unwrap();
447-
assert_eq!(
448-
result.tuples.len(),
449-
20,
450-
"tenant_a should have 20 tuples"
451-
);
420+
assert_eq!(result.tuples.len(), 20, "tenant_a should have 20 tuples");
452421

453422
let result = engine_b
454423
.query(
@@ -457,11 +426,7 @@ fn test_concurrent_tenant_operations() {
457426
None,
458427
)
459428
.unwrap();
460-
assert_eq!(
461-
result.tuples.len(),
462-
20,
463-
"tenant_b should have 20 tuples"
464-
);
429+
assert_eq!(result.tuples.len(), 20, "tenant_b should have 20 tuples");
465430

466431
engine_a.close().unwrap();
467432
engine_b.close().unwrap();

crates/aegis-core/tests/persistence.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,13 +269,19 @@ fn test_recover_from_events() {
269269

270270
// Recover to the current revision (replays event log)
271271
let recovered = engine.recover_from_events(Some(rev)).unwrap();
272-
assert!(recovered.as_u64() >= rev.as_u64(), "recovery should reach at least the current revision");
272+
assert!(
273+
recovered.as_u64() >= rev.as_u64(),
274+
"recovery should reach at least the current revision"
275+
);
273276

274277
verify_n_tuples(&engine, 10);
275278

276279
// Also test with None (recover to latest)
277280
let recovered = engine.recover_from_events(None).unwrap();
278-
assert!(recovered.as_u64() >= rev.as_u64(), "recovery to latest should succeed");
281+
assert!(
282+
recovered.as_u64() >= rev.as_u64(),
283+
"recovery to latest should succeed"
284+
);
279285

280286
verify_n_tuples(&engine, 10);
281287

crates/aegis-core/tests/security.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,7 @@ fn test_subject_with_many_relationships() {
8585
let elapsed = start.elapsed();
8686

8787
assert!(result.allowed);
88-
assert!(
89-
elapsed.as_secs() < 5,
90-
"check took too long: {:?}",
91-
elapsed
92-
);
88+
assert!(elapsed.as_secs() < 5, "check took too long: {:?}", elapsed);
9389
}
9490

9591
#[test]

crates/aegis-core/tests/stress.rs

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,13 @@ fn str005_read_pool_exhaustion() {
7575
let alice = SubjectId::new("user:alice").unwrap();
7676
let resource = ResourceId::new("repo:shared").unwrap();
7777

78-
engine.write(&RelationshipTuple::new(
79-
alice.clone(),
80-
Relation::new("owner").unwrap(),
81-
resource.clone(),
82-
)).unwrap();
78+
engine
79+
.write(&RelationshipTuple::new(
80+
alice.clone(),
81+
Relation::new("owner").unwrap(),
82+
resource.clone(),
83+
))
84+
.unwrap();
8385

8486
let mut handles = vec![];
8587
for _ in 0..10 {
@@ -99,7 +101,9 @@ fn str005_read_pool_exhaustion() {
99101
assert!(result.allowed);
100102
ok_count += 1;
101103
}
102-
Err(_) => { _err_count += 1; }
104+
Err(_) => {
105+
_err_count += 1;
106+
}
103107
}
104108
}
105109

@@ -474,17 +478,33 @@ fn str008_deep_hierarchy_scaled() {
474478

475479
// Depth 5 from root should be reachable
476480
let result = engine
477-
.check(&root, "read", &ResourceId::new("repo:level4").unwrap(), None)
481+
.check(
482+
&root,
483+
"read",
484+
&ResourceId::new("repo:level4").unwrap(),
485+
None,
486+
)
478487
.unwrap();
479-
assert!(result.allowed, "root should have transitive access at depth 5");
488+
assert!(
489+
result.allowed,
490+
"root should have transitive access at depth 5"
491+
);
480492

481493
// Depth 9 from root exceeds default max_traversal_depth (10)
482494
// The traversal starts at the resource being checked and walks up,
483495
// so depth 9 means 9 hops, which is within the limit of 10
484496
let result = engine
485-
.check(&root, "read", &ResourceId::new("repo:level9").unwrap(), None)
497+
.check(
498+
&root,
499+
"read",
500+
&ResourceId::new("repo:level9").unwrap(),
501+
None,
502+
)
486503
.unwrap();
487-
assert!(result.allowed, "root should have transitive access at depth 9");
504+
assert!(
505+
result.allowed,
506+
"root should have transitive access at depth 9"
507+
);
488508

489509
engine.close().unwrap();
490510
}

0 commit comments

Comments
 (0)