Pad output hex to field size (both json and csv)

8 files changed, 108 insertions, 8 deletions

diff --git a/test/ecgen.sh b/test/ecgen.sh
index 6e018d1..6e1dd0a 100755
--- a/test/ecgen.sh
+++ b/test/ecgen.sh
@@ -20,18 +20,18 @@ function json() {
 	fp=$(${ecgen} --fp -tjson --input=fp_10_a.csv.in 10)
 	f2m=$(${ecgen} --f2m -tjson --input=f2m_10_a.csv.in 10)
 	assert_raises "${JSON}" 0 "${fp}"
-	assert_matches "${JSON} -x field\\\",\\\"p" "0xb" "${fp}"
-	assert_matches "${JSON} -x \\\"a\\\"" "0x1" "${fp}"
-	assert_matches "${JSON} -x \\\"b\\\"" "0x2" "${fp}"
-	assert_matches "${JSON} -x \\\"order\\\"" "0x10" "${fp}"
+	assert_matches "${JSON} -x field\\\",\\\"p" "0x000b" "${fp}"
+	assert_matches "${JSON} -x \\\"a\\\"" "0x0001" "${fp}"
+	assert_matches "${JSON} -x \\\"b\\\"" "0x0002" "${fp}"
+	assert_matches "${JSON} -x \\\"order\\\"" "0x0010" "${fp}"
 
 	assert_raises "${JSON}" 0 "${f2m}"
 	assert_matches "${JSON} -x field\\\",\\\"m" "0xa" "${f2m}"
 	assert_matches "${JSON} -x field\\\",\\\"e1" "0x3" "${f2m}"
 	assert_matches "${JSON} -x field\\\",\\\"e2" "0x0" "${f2m}"
 	assert_matches "${JSON} -x field\\\",\\\"e3" "0x0" "${f2m}"
-	assert_matches "${JSON} -x \\\"a\\\"" "0x2ed" "${f2m}"
-	assert_matches "${JSON} -x \\\"b\\\"" "0xb7" "${f2m}"
+	assert_matches "${JSON} -x \\\"a\\\"" "0x02ed" "${f2m}"
+	assert_matches "${JSON} -x \\\"b\\\"" "0x00b7" "${f2m}"
 	assert_matches "${JSON} -x \\\"order\\\"" "0x3de" "${f2m}"
 }
 
diff --git a/test/econvert_format.csv b/test/econvert_format.csv
new file mode 100644
index 0000000..358d807
--- /dev/null
+++ b/test/econvert_format.csv
@@ -0,0 +1 @@
+0xb,0x1,0x2,0x2,0xa,0x8,0x2,0x7,0x0,0x2,0x8,0x10,0x7,0x0,0x2
\ No newline at end of file
diff --git a/test/econvert_format.json b/test/econvert_format.json
new file mode 100644
index 0000000..8bb9bc2
--- /dev/null
+++ b/test/econvert_format.json
@@ -0,0 +1,29 @@
+{
+  "field": {
+    "p": "0xb"
+  },
+  "a": "0x1",
+  "b": "0x2",
+  "order": "0x10",
+  "generators": [
+    {
+      "x": "0x2",
+      "y": "0xa",
+      "order": "0x8",
+      "cofactor": "0x2"
+    },
+    {
+      "x": "0x7",
+      "y": "0x0",
+      "order": "0x2",
+      "cofactor": "0x8"
+    }
+  ],
+  "points": [
+    {
+      "x": "0x7",
+      "y": "0x0",
+      "order": "0x2"
+    }
+  ]
+}
diff --git a/test/f2m_10_a.csv b/test/f2m_10_a.csv
index 2ba807e..913fe0f 100644
--- a/test/f2m_10_a.csv
+++ b/test/f2m_10_a.csv
@@ -1 +1 @@
-0xa,0x3,0x0,0x0,0x2ed,0xb7,0x[0-9a-f]{1,3},0x[0-9a-f]{1,3},0x3de,0x1,0x3de,0x0,0x0,0x2,0x2fb,0x(285|7e),0x3,0x[0-9a-f]{1,2},0x[0-9a-f]{1,3},0x[0-9a-f]{1,3},0x[0-9a-f]{1,3},0x[0-9a-f]{1,3},0xb
+0xa,0x3,0x0,0x0,0x02ed,0x00b7,0x03de,0x[0-9a-f]{4},0x[0-9a-f]{4},0x3de,0x1,0x0000,0x0000,0x2,0x02fb,0x(0285|007e),0x3,0x[0-9a-f]{4},0x[0-9a-f]{4},0x[0-9a-f]{1,3},0x[0-9a-f]{4},0x[0-9a-f]{4},0xb
diff --git a/test/f2m_10_a.json b/test/f2m_10_a.json
new file mode 100644
index 0000000..e04fbd8
--- /dev/null
+++ b/test/f2m_10_a.json
@@ -0,0 +1,41 @@
+{
+    "field": {
+        "m": "0xa",
+        "e1": "0x3",
+        "e2": "0x0",
+        "e3": "0x0"
+    },
+    "a": "0x2ed",
+    "b": "0xb7",
+    "order": "0x3de",
+    "generators": [
+        {
+            "x": "0x16a",
+            "y": "0x197",
+            "order": "0x3de",
+            "cofactor": "0x1"
+        }
+    ],
+    "points": [
+        {
+            "x": "0x0",
+            "y": "0x0",
+            "order": "0x2"
+        },
+        {
+            "x": "0x2fb",
+            "y": "0x285",
+            "order": "0x3"
+        },
+        {
+            "x": "0x9d",
+            "y": "0xd7",
+            "order": "0x5"
+        },
+        {
+            "x": "0x2bc",
+            "y": "0x165",
+            "order": "0xb"
+        }
+    ]
+}
diff --git a/test/fp_10_a.csv b/test/fp_10_a.csv
index d90d75a..b9ec96c 100644
--- a/test/fp_10_a.csv
+++ b/test/fp_10_a.csv
@@ -1 +1 @@
-0xb,0x1,0x2,0x[0-9a-f],0x[0-9a-f],0x8,0x2,0x[0-9a-f],0x[0-9a-f],0x[0-9a-f],0x[0-9a-f],0x10,0x[0-9a-f],0x[0-9a-f],0x2
+0x000b,0x0001,0x0002,0x0010,0x[0-9a-f]{4},0x[0-9a-f]{4},0x8,0x2,0x[0-9a-f]{4},0x[0-9a-f]{4},0x[0-9a-f]{1,4},0x[0-9a-f]{1,4},0x[0-9a-f]{4},0x[0-9a-f]{4},0x2.*
diff --git a/test/fp_10_a.json b/test/fp_10_a.json
new file mode 100644
index 0000000..666491a
--- /dev/null
+++ b/test/fp_10_a.json
@@ -0,0 +1,29 @@
+\{
+    "field": \{
+        "p": "0xb"
+    \},
+    "a": "0x1",
+    "b": "0x2",
+    "order": "0x10",
+    "generators": \[
+        \{
+            "x": "0x\d{1,2}",
+            "y": "0x\d{1,2}",
+            "order": "0x8",
+            "cofactor": "0x2"
+        \},
+        \{
+            "x": "0x\d{1,2}",
+            "y": "0x\d{1,2}",
+            "order": "0x8",
+            "cofactor": "0x2"
+        \}
+    \],
+    "points": \[
+        \{
+            "x": "0x\d{1,2}",
+            "y": "0x\d{1,2}",
+            "order": "0x2"
+        \}
+    \]
+\}
\ No newline at end of file
diff --git a/test/verify.gp b/test/verify.gp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/verify.gp