schemas: lift up common AsnSignatureTestVector def

Author: cpu

schemas/dsa_verify_schema_v1.json

@@ -33,53 +33,13 @@
         "tests": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/AsnSignatureTestVector"
+            "$ref": "verify_common.json#/definitions/AsnSignatureTestVector"
           }
         }
       },
       "required": ["source"],
       "additionalProperties": false
-    },
-    "AsnSignatureTestVector": {
-      "type": "object",
-      "properties": {
-        "tcId": {
-          "type": "integer",
-          "description": "Identifier of the test case"
-        },
-        "comment": {
-          "type": "string",
-          "description": "A brief description of the test case"
-        },
-        "msg": {
-          "type": "string",
-          "format": "HexBytes",
-          "description": "The message to sign"
-        },
-        "sig": {
-          "type": "string",
-          "format": "Asn",
-          "description": "An ASN encoded signature for msg"
-        },
-        "result": {
-          "type": "string",
-          "description": "Test result",
-          "enum": [
-            "valid",
-            "invalid",
-            "acceptable"
-          ]
-        },
-        "flags": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "A list of flags"
-        }
-      }
-    },
-    "additionalProperties": false
+    }
   },
   "properties": {
     "algorithm": {

schemas/ecdsa_verify_schema_v1.json

@@ -33,52 +33,12 @@
         "tests": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/AsnSignatureTestVector"
+            "$ref": "verify_common.json#/definitions/AsnSignatureTestVector"
           }
         }
       },
       "required": ["source"],
       "additionalProperties": false
-    },
-    "AsnSignatureTestVector": {
-      "type": "object",
-      "properties": {
-        "tcId": {
-          "type": "integer",
-          "description": "Identifier of the test case"
-        },
-        "comment": {
-          "type": "string",
-          "description": "A brief description of the test case"
-        },
-        "msg": {
-          "type": "string",
-          "format": "HexBytes",
-          "description": "The message to sign"
-        },
-        "sig": {
-          "type": "string",
-          "format": "Asn",
-          "description": "An ASN encoded signature for msg"
-        },
-        "result": {
-          "type": "string",
-          "description": "Test result",
-          "enum": [
-            "valid",
-            "invalid",
-            "acceptable"
-          ]
-        },
-        "flags": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "A list of flags"
-        }
-      },
-      "additionalProperties": false
     }
   },
   "properties": {

schemas/verify_common.json

@@ -0,0 +1,46 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+    "AsnSignatureTestVector": {
+      "type": "object",
+      "properties": {
+        "tcId": {
+          "type": "integer",
+          "description": "Identifier of the test case"
+        },
+        "comment": {
+          "type": "string",
+          "description": "A brief description of the test case"
+        },
+        "msg": {
+          "type": "string",
+          "format": "HexBytes",
+          "description": "The message to sign"
+        },
+        "sig": {
+          "type": "string",
+          "format": "Asn",
+          "description": "An ASN encoded signature for msg"
+        },
+        "result": {
+          "type": "string",
+          "description": "Test result",
+          "enum": [
+            "valid",
+            "invalid",
+            "acceptable"
+          ]
+        },
+        "flags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "A list of flags"
+        }
+      },
+      "additionalProperties": false,
+      "required": [ "tcId", "comment", "msg", "sig", "result", "flags"]
+    }
+  }
+}