File tree 1 file changed +1
-32
lines changed
1 file changed +1
-32
lines changed Original file line number Diff line number Diff line change @@ -96,19 +96,7 @@ impl FromStr for SlurmFile {
96
96
type Err = serde_json:: Error ;
97
97
98
98
fn from_str ( s : & str ) -> Result < Self , Self :: Err > {
99
- let slurm: Result < SlurmFile , serde_json:: Error > = serde_json:: from_str ( s) ;
100
- if let Ok ( s) = & slurm {
101
- if s. version == SlurmVersion :: v1 ( ) &&
102
- ( s. assertions . aspa . is_some ( ) || s. filters . aspa . is_some ( ) ) {
103
- return Err ( Self :: Err :: custom (
104
- "ASPA field present in SLURM v1" ) ) ;
105
- } else if s. version == SlurmVersion :: v2 ( ) &&
106
- ( s. assertions . aspa . is_none ( ) || s. filters . aspa . is_none ( ) ) {
107
- return Err ( Self :: Err :: custom (
108
- "ASPA field not present in SLURM v2" ) ) ;
109
- }
110
- }
111
- slurm
99
+ serde_json:: from_str ( s)
112
100
}
113
101
}
114
102
@@ -1487,25 +1475,6 @@ mod test {
1487
1475
"##
1488
1476
) . is_err( )
1489
1477
) ;
1490
-
1491
- // wrong SLURM version.
1492
- assert ! (
1493
- SlurmFile :: from_str(
1494
- r##"
1495
- {
1496
- "slurmVersion": 2,
1497
- "validationOutputFilters": {
1498
- "prefixFilters": [],
1499
- "bgpsecFilters": []
1500
- },
1501
- "locallyAddedAssertions": {
1502
- "prefixAssertions": [],
1503
- "bgpsecAssertions": []
1504
- }
1505
- }
1506
- "##
1507
- ) . is_err( )
1508
- ) ;
1509
1478
}
1510
1479
}
1511
1480
You can’t perform that action at this time.
0 commit comments