Fix serialization lint script and fix test data lint.

obi1kenobi · Jul 2, 2022 · f7239ba · f7239ba
1 parent b8ed45c
commit f7239ba
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 17 deletions.
diff --git a/trustfall_core/src/main.rs b/trustfall_core/src/main.rs
@@ -24,7 +24,7 @@ use std::{
 use async_graphql_parser::{parse_query, parse_schema};
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
-use trustfall_core::schema::error::InvalidSchemaError;
+use trustfall_core::{interpreter::error::QueryArgumentsError, schema::error::InvalidSchemaError};
 
 use crate::{
     filesystem_interpreter::{FilesystemInterpreter, FilesystemToken},
@@ -36,7 +36,7 @@ use crate::{
         Adapter,
     },
     nullables_interpreter::NullablesAdapter,
-    numbers_interpreter::NumbersAdapter,
+    numbers_interpreter::{NumbersAdapter, NumbersToken},
     schema::Schema,
     util::{
         TestGraphQLQuery, TestIRQuery, TestIRQueryResult, TestInterpreterOutputTrace,
@@ -199,14 +199,26 @@ fn reserialize(path: &str) {
             serialize_to_ron(&test_query_result)
         }
         Some((_, "trace")) => {
-            let test_trace: TestInterpreterOutputTrace<FilesystemToken> =
-                ron::from_str(&input_data).unwrap();
-            serialize_to_ron(&test_trace)
+            if let Ok(test_trace) =
+                ron::from_str::<TestInterpreterOutputTrace<NumbersToken>>(&input_data)
+            {
+                serialize_to_ron(&test_trace)
+            } else if let Ok(test_trace) =
+                ron::from_str::<TestInterpreterOutputTrace<FilesystemToken>>(&input_data)
+            {
+                serialize_to_ron(&test_trace)
+            } else {
+                unreachable!()
+            }
         }
         Some((_, "schema-error")) => {
             let schema_error: InvalidSchemaError = ron::from_str(&input_data).unwrap();
             serialize_to_ron(&schema_error)
         }
+        Some((_, "exec-error")) => {
+            let exec_error: QueryArgumentsError = ron::from_str(&input_data).unwrap();
+            serialize_to_ron(&exec_error)
+        }
         Some((_, ext)) => unreachable!("{}", ext),
         None => unreachable!("{}", path),
     };

diff --git a/...core/src/resources/test_data/execution_errors/missing_unused_and_invalid_arguments.ir.ron b/...core/src/resources/test_data/execution_errors/missing_unused_and_invalid_arguments.ir.ron
@@ -52,8 +52,8 @@ Ok(TestIRQuery(
     },
   ),
   arguments: {
-    "substr": Int64(4),
-    "num": String("four"),
     "min": Int64(0),
+    "num": String("four"),
+    "substr": Int64(4),
   },
 ))
diff --git a/trustfall_core/src/resources/test_data/valid_queries/coercion_on_recursed_edge.ir.ron b/trustfall_core/src/resources/test_data/valid_queries/coercion_on_recursed_edge.ir.ron
@@ -27,7 +27,6 @@ Ok(TestIRQuery(
           edge_name: "successor",
           recursive: Some(Recursive(
             depth: 3,
-            coerce_to: None,
           )),
         ),
       },

diff --git a/trustfall_core/src/resources/test_data/valid_queries/coercion_on_recursed_edge.trace.ron b/trustfall_core/src/resources/test_data/valid_queries/coercion_on_recursed_edge.trace.ron
@@ -2336,7 +2336,6 @@ TestInterpreterOutputTrace(
             edge_name: "successor",
             recursive: Some(Recursive(
               depth: 3,
-              coerce_to: None,
             )),
           ),
         },

diff --git a/trustfall_core/src/resources/test_data/valid_queries/recurse_and_traverse.ir.ron b/trustfall_core/src/resources/test_data/valid_queries/recurse_and_traverse.ir.ron
@@ -30,7 +30,6 @@ Ok(TestIRQuery(
           edge_name: "successor",
           recursive: Some(Recursive(
             depth: 3,
-            coerce_to: None,
           )),
         ),
         Eid(2): IREdge(

diff --git a/trustfall_core/src/resources/test_data/valid_queries/recurse_and_traverse.trace.ron b/trustfall_core/src/resources/test_data/valid_queries/recurse_and_traverse.trace.ron
@@ -3935,7 +3935,6 @@ TestInterpreterOutputTrace(
             edge_name: "successor",
             recursive: Some(Recursive(
               depth: 3,
-              coerce_to: None,
             )),
           ),
           Eid(2): IREdge(

diff --git a/trustfall_core/src/resources/test_data/valid_queries/recurse_directive.ir.ron b/trustfall_core/src/resources/test_data/valid_queries/recurse_directive.ir.ron
@@ -26,7 +26,6 @@ Ok(TestIRQuery(
           edge_name: "successor",
           recursive: Some(Recursive(
             depth: 3,
-            coerce_to: None,
           )),
         ),
       },

diff --git a/trustfall_core/src/resources/test_data/valid_queries/recurse_directive.trace.ron b/trustfall_core/src/resources/test_data/valid_queries/recurse_directive.trace.ron
@@ -1878,7 +1878,6 @@ TestInterpreterOutputTrace(
             edge_name: "successor",
             recursive: Some(Recursive(
               depth: 3,
-              coerce_to: None,
             )),
           ),
         },

diff --git a/trustfall_core/src/resources/test_data/valid_queries/recurse_then_filter_intermediate.ir.ron b/trustfall_core/src/resources/test_data/valid_queries/recurse_then_filter_intermediate.ir.ron
@@ -35,7 +35,6 @@ Ok(TestIRQuery(
           edge_name: "successor",
           recursive: Some(Recursive(
             depth: 3,
-            coerce_to: None,
           )),
         ),
       },

diff --git a/...all_core/src/resources/test_data/valid_queries/recurse_then_filter_intermediate.trace.ron b/...all_core/src/resources/test_data/valid_queries/recurse_then_filter_intermediate.trace.ron
@@ -2064,7 +2064,6 @@ TestInterpreterOutputTrace(
             edge_name: "successor",
             recursive: Some(Recursive(
               depth: 3,
-              coerce_to: None,
             )),
           ),
         },

diff --git a/trustfall_core/src/resources/test_data/valid_queries/recurse_then_filter_leaves.ir.ron b/trustfall_core/src/resources/test_data/valid_queries/recurse_then_filter_leaves.ir.ron
@@ -35,7 +35,6 @@ Ok(TestIRQuery(
           edge_name: "successor",
           recursive: Some(Recursive(
             depth: 3,
-            coerce_to: None,
           )),
         ),
       },

diff --git a/trustfall_core/src/resources/test_data/valid_queries/recurse_then_filter_leaves.trace.ron b/trustfall_core/src/resources/test_data/valid_queries/recurse_then_filter_leaves.trace.ron
@@ -1978,7 +1978,6 @@ TestInterpreterOutputTrace(
             edge_name: "successor",
             recursive: Some(Recursive(
               depth: 3,
-              coerce_to: None,
             )),
           ),
         },