Fix broken validate mode tests

Author: MatthewDaggitt

vehicle/src/Vehicle/Backend/Queries/UserVariableElimination/VariableReconstruction.hs

@@ -53,7 +53,7 @@ createInitialAssignment ::
   QueryVariableAssignment ->
   MixedVariableAssignment
 createInitialAssignment queryVariableMap (QueryVariableAssignment valuesByQueryVar) = do
-  let missingVariable var = developerError ("Missing query variable" <+> pretty var)
+  let missingVariable var = developerError ("Solver returned additional unknown variable" <+> pretty var)
   let mapQueryVariable var = coerce $ fromMaybe (missingVariable var) (Map.lookup var queryVariableMap)
   let valuesByNetworkVar = ZeroDimTensor <$> Map.mapKeys mapQueryVariable valuesByQueryVar
   valuesByNetworkVar

vehicle/tests/golden/validate/error/alteredNetwork.err.golden

@@ -1,5 +0,0 @@
-Something went wrong internally. Please report the error shown below to `https://github.com/vehicle-lang/vehicle/issues`.
-Error: Missing query variable f_X[1]
-Stack:
-CallStack (from HasCallStack):
-  developerError, called at src/Vehicle/Backend/Queries/UserVariableElimination/VariableReconstruction.hs:56:29 in vehicle-0.16.1-inplace:Vehicle.Backend.Queries.UserVariableElimination.VariableReconstruction

vehicle/tests/golden/validate/error/missingNetwork.err.golden

@@ -1,5 +0,0 @@
-Something went wrong internally. Please report the error shown below to `https://github.com/vehicle-lang/vehicle/issues`.
-Error: Missing query variable f_X[1]
-Stack:
-CallStack (from HasCallStack):
-  developerError, called at src/Vehicle/Backend/Queries/UserVariableElimination/VariableReconstruction.hs:56:29 in vehicle-0.16.1-inplace:Vehicle.Backend.Queries.UserVariableElimination.VariableReconstruction

vehicle/tests/golden/validate/error/test.json

@@ -1,7 +1,7 @@
 [
   {
   "name": "missingNetwork",
-  "run": "vehicle verify -s spec.vcl -v TestVerifier --network f:fake.onnx --property trivial --verifier-location=testVerifier --verifier-args='sat 'f_X[0]=0.2,f_X[1]=0.3,f_Y[0]=3.0'' --cache verify-cache > /dev/null ; mv fake.onnx fake-changed.onnx && vehicle validate -c verify-cache -j && mv fake-changed.onnx fake.onnx",
+  "run": "vehicle verify -s spec.vcl -v TestVerifier --network f:fake.onnx --property trivial --verifier-location=testVerifier --verifier-args='sat 'f_X[0]=0.2,f_Y[0]=3.0'' --cache verify-cache > /dev/null ; mv fake.onnx fake-changed.onnx && vehicle validate -c verify-cache -j && mv fake-changed.onnx fake.onnx",
   "needs": ["fake.onnx", "spec.vcl", "../../../testVerifier"],
   "external": ["TestVerifier"],
   "ignore": {
@@ -14,7 +14,7 @@
 },
 {
   "name": "alteredNetwork",
-  "run": "vehicle verify -s spec.vcl -v TestVerifier --network f:fake.onnx --property trivial --verifier-location=testVerifier --verifier-args='sat 'f_X[0]=0.2,f_X[1]=0.3,f_Y[0]=3.0'' --cache verify-cache > /dev/null ; echo \"FAKE CHANGED ONNX NETWORK\" > fake.onnx && vehicle validate -c verify-cache -j && echo \"FAKE ONNX NETWORK\n\" > fake.onnx",
+  "run": "vehicle verify -s spec.vcl -v TestVerifier --network f:fake.onnx --property trivial --verifier-location=testVerifier --verifier-args='sat 'f_X[0]=0.2,f_Y[0]=3.0'' --cache verify-cache > /dev/null ; echo \"FAKE CHANGED ONNX NETWORK\" > fake.onnx && vehicle validate -c verify-cache -j && echo \"FAKE ONNX NETWORK\n\" > fake.onnx",
   "needs": ["fake.onnx", "spec.vcl", "../../../testVerifier"],
   "external": ["TestVerifier"],
   "ignore": {

vehicle/tests/golden/validate/success/simple.err.golden

@@ -1,3 +1,7 @@
+Verifying properties:
+  trivial [........................................................] 0/1 queries  trivial [========================================================] 1/1 queries
+    result: 🗸 - TestVerifier found a witness
+      
 {
   "tag": "Verified"
 }

vehicle/tests/golden/validate/success/simple.out.golden

@@ -1,7 +1,7 @@
 [
   {
   "name": "simple",
-  "run": "vehicle verify -s spec.vcl -v TestVerifier --network f:fake.onnx --property trivial --verifier-location=testVerifier --verifier-args='sat 'f_X[0]=0.2,f_X[1]=0.3,f_Y[0]=3.0'' --cache verify-cache > /dev/null ; vehicle validate -c verify-cache -j",
+  "run": "vehicle verify -s spec.vcl -v TestVerifier --network f:fake.onnx --property trivial --verifier-location=testVerifier --verifier-args='sat 'f_X[0]=0,f_Y[0]=3.0'' --cache verify-cache ; vehicle validate -c verify-cache -j",
   "needs": ["fake.onnx", "spec.vcl", "../../../testVerifier"],
   "external": ["TestVerifier"],
   "ignore": {