fix: matching both devnet4 and devnet5 sync fixtures

Author: Sahilgill24

testing/lean-spec-tests/src/sync.rs

@@ -19,13 +19,35 @@ pub fn load_sync_test(path: impl AsRef<Path>) -> anyhow::Result<TestFixture<Sync
 
 /// Run a single sync test case (currently the only operation is `verify_checkpoint`)
 pub fn run_sync_test(test_name: &str, test: &SyncTest) -> anyhow::Result<()> {
-    info!(
-        "Running sync test: {test_name} (operation={})",
-        test.operation
-    );
+    // devnet4: operation is a plain string, params in output
+    // devnet5: operation is an object with kind + params
+    let (operation_kind, num_validators, expected_anchor_slot) =
+        if let Some(kind) = test.operation.as_str() {
+            let num_validators = test
+                .output
+                .validator_count
+                .ok_or_else(|| anyhow!("devnet4 format requires output.validatorCount"))?;
+            let anchor_slot = test
+                .output
+                .anchor_slot
+                .ok_or_else(|| anyhow!("devnet4 format requires output.anchorSlot"))?;
+            (kind.to_string(), num_validators, anchor_slot)
+        } else {
+            let kind = test.operation["kind"]
+                .as_str()
+                .ok_or_else(|| anyhow!("Missing operation.kind"))?
+                .to_string();
+            let num_validators = test.operation["numValidators"]
+                .as_u64()
+                .ok_or_else(|| anyhow!("Missing operation.numValidators"))?;
+            let anchor_slot = test.operation["anchorSlot"].as_u64().unwrap_or(0);
+            (kind, num_validators, anchor_slot)
+        };
+
+    info!("Running sync test: {test_name} (operation={operation_kind})");
 
-    if test.operation != "verify_checkpoint" {
-        bail!("Unknown sync operation: {}", test.operation);
+    if operation_kind != "verify_checkpoint" {
+        bail!("Unknown sync operation: {operation_kind}");
     }
 
     let state_bytes = hex::decode(test.output.state_bytes.trim_start_matches("0x"))
@@ -39,14 +61,12 @@ pub fn run_sync_test(test_name: &str, test: &SyncTest) -> anyhow::Result<()> {
     let actually_valid = actual_validator_count > 0;
 
     ensure!(
-        actual_validator_count == test.output.validator_count,
-        "validatorCount mismatch: expected {}, got {actual_validator_count}",
-        test.output.validator_count,
+        actual_validator_count == num_validators,
+        "validatorCount mismatch: expected {num_validators}, got {actual_validator_count}",
     );
     ensure!(
-        actual_slot == test.output.anchor_slot,
-        "anchorSlot mismatch: expected {}, got {actual_slot}",
-        test.output.anchor_slot,
+        actual_slot == expected_anchor_slot,
+        "anchorSlot mismatch: expected {expected_anchor_slot}, got {actual_slot}",
     );
     ensure!(
         actually_valid == test.output.valid,

testing/lean-spec-tests/src/types/sync.rs

@@ -4,8 +4,11 @@ use serde::Deserialize;
 #[serde(rename_all = "camelCase")]
 pub struct SyncTest {
     pub network: String,
-    pub operation: String,
-    pub input: SyncInput,
+    /// devnet4: plain string; devnet5: object with `kind`, `numValidators`, `anchorSlot`
+    pub operation: serde_json::Value,
+    /// devnet4 only — params moved into `operation` in devnet5
+    #[serde(default)]
+    pub input: Option<SyncInput>,
     pub output: SyncOutput,
 }
 
@@ -22,6 +25,10 @@ pub struct SyncInput {
 pub struct SyncOutput {
     pub valid: bool,
     pub state_bytes: String,
-    pub validator_count: u64,
-    pub anchor_slot: u64,
+    /// devnet4 only — in devnet5 this lives in `operation`
+    #[serde(default)]
+    pub validator_count: Option<u64>,
+    /// devnet4 only — in devnet5 this lives in `operation`
+    #[serde(default)]
+    pub anchor_slot: Option<u64>,
 }