From 352631b07ddec1529702624c19bb40822dad5a20 Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Tue, 25 Aug 2020 11:32:31 -0700
Subject: [PATCH] ecdsa: fix tests (#132)

---
 ecdsa/src/dev.rs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ecdsa/src/dev.rs b/ecdsa/src/dev.rs
index a3161cc..8c28387 100644
--- a/ecdsa/src/dev.rs
+++ b/ecdsa/src/dev.rs
@@ -33,7 +33,7 @@ pub struct TestVector {
 macro_rules! new_signing_test {
     ($vectors:expr) => {
         use core::convert::TryInto;
-        use $crate::{elliptic_curve::weierstrass::UncompressedPoint, generic_array::GenericArray};
+        use $crate::generic_array::GenericArray;
 
         #[test]
         fn ecdsa_signing() {
@@ -56,15 +56,18 @@ macro_rules! new_signing_test {
 #[cfg_attr(docsrs, doc(cfg(feature = "dev")))]
 macro_rules! new_verification_test {
     ($vectors:expr) => {
+        use $crate::elliptic_curve::sec1::EncodedPoint;
+
         #[test]
         fn ecdsa_verify_success() {
             for vector in $vectors {
-                let q_raw = UncompressedPoint::from_affine_coords(
+                let q_encoded = EncodedPoint::from_affine_coords(
                     GenericArray::from_slice(vector.q_x),
                     GenericArray::from_slice(vector.q_y),
+                    false,
                 );
 
-                let q = AffinePoint::from_uncompressed_point(&q_raw).unwrap();
+                let q: AffinePoint = q_encoded.decode().unwrap();
 
                 let sig = Signature::from_scalars(
                     GenericArray::from_slice(vector.r),
@@ -79,12 +82,13 @@ macro_rules! new_verification_test {
         #[test]
         fn ecdsa_verify_invalid_s() {
             for vector in $vectors {
-                let q_raw = UncompressedPoint::from_affine_coords(
+                let q_encoded = EncodedPoint::from_affine_coords(
                     GenericArray::from_slice(vector.q_x),
                     GenericArray::from_slice(vector.q_y),
+                    false,
                 );
 
-                let q = AffinePoint::from_uncompressed_point(&q_raw).unwrap();
+                let q: AffinePoint = q_encoded.decode().unwrap();
 
                 // Flip a bit in `s`
                 let mut s_tweaked = GenericArray::clone_from_slice(vector.s);