Skip to content

Commit ad96d10

Browse files
committed
Remove SLURM version check
1 parent 6b5fa06 commit ad96d10

File tree

1 file changed

+1
-32
lines changed

1 file changed

+1
-32
lines changed

src/slurm.rs

+1-32
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,7 @@ impl FromStr for SlurmFile {
9696
type Err = serde_json::Error;
9797

9898
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)
112100
}
113101
}
114102

@@ -1487,25 +1475,6 @@ mod test {
14871475
"##
14881476
).is_err()
14891477
);
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-
);
15091478
}
15101479
}
15111480

0 commit comments

Comments
 (0)