From 1dca72a1cc8c75f5324b163ab2e4644c9f243fe6 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Mon, 19 Jul 2021 12:57:50 +0100
Subject: [PATCH] Migrate to latest `halo2` test API

---
 Cargo.toml                                            | 2 +-
 src/circuit/gadget/ecc/chip/mul_fixed/short.rs        | 8 ++++----
 src/circuit/gadget/utilities.rs                       | 2 +-
 src/circuit/gadget/utilities/decompose_running_sum.rs | 4 ++--
 src/circuit/gadget/utilities/enable_flag.rs           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1a575ec6..51040eed 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -62,5 +62,5 @@ name = "small"
 harness = false
 
 [patch.crates-io]
-halo2 = { git = "https://github.com/zcash/halo2.git", rev = "4a9e329ded1c54347af105210c77587bb69f3c57" }
+halo2 = { git = "https://github.com/zcash/halo2.git", rev = "dda1be47316c32585c0d974c0b6401108714875d" }
 zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "cc533a9da4f6a7209a7be05f82b12a03969152c9" }
diff --git a/src/circuit/gadget/ecc/chip/mul_fixed/short.rs b/src/circuit/gadget/ecc/chip/mul_fixed/short.rs
index 72effbde..924e1815 100644
--- a/src/circuit/gadget/ecc/chip/mul_fixed/short.rs
+++ b/src/circuit/gadget/ecc/chip/mul_fixed/short.rs
@@ -475,11 +475,11 @@ pub mod tests {
                 assert_eq!(
                     prover.verify(),
                     Err(vec![
-                        VerifyFailure::Constraint {
+                        VerifyFailure::ConstraintNotSatisfied {
                             constraint: ((2, "final z = 0").into(), 0, "").into(),
                             row: 24
                         },
-                        VerifyFailure::Constraint {
+                        VerifyFailure::ConstraintNotSatisfied {
                             constraint: (
                                 (13, "Short fixed-base mul gate").into(),
                                 0,
@@ -504,12 +504,12 @@ pub mod tests {
             assert_eq!(
                 prover.verify(),
                 Err(vec![
-                    VerifyFailure::Constraint {
+                    VerifyFailure::ConstraintNotSatisfied {
                         constraint: ((13, "Short fixed-base mul gate").into(), 1, "sign_check")
                             .into(),
                         row: 26
                     },
-                    VerifyFailure::Constraint {
+                    VerifyFailure::ConstraintNotSatisfied {
                         constraint: (
                             (13, "Short fixed-base mul gate").into(),
                             3,
diff --git a/src/circuit/gadget/utilities.rs b/src/circuit/gadget/utilities.rs
index 8e6896e2..19c95752 100644
--- a/src/circuit/gadget/utilities.rs
+++ b/src/circuit/gadget/utilities.rs
@@ -214,7 +214,7 @@ mod tests {
             let prover = MockProver::<pallas::Base>::run(3, &circuit, vec![]).unwrap();
             assert_eq!(
                 prover.verify(),
-                Err(vec![VerifyFailure::Constraint {
+                Err(vec![VerifyFailure::ConstraintNotSatisfied {
                     constraint: ((0, "range check").into(), 0, "").into(),
                     row: 0
                 }])
diff --git a/src/circuit/gadget/utilities/decompose_running_sum.rs b/src/circuit/gadget/utilities/decompose_running_sum.rs
index 2d3b5579..45627dd7 100644
--- a/src/circuit/gadget/utilities/decompose_running_sum.rs
+++ b/src/circuit/gadget/utilities/decompose_running_sum.rs
@@ -365,11 +365,11 @@ mod tests {
             assert_eq!(
                 prover.verify(),
                 Err(vec![
-                    VerifyFailure::Constraint {
+                    VerifyFailure::ConstraintNotSatisfied {
                         constraint: ((1, "final z = 0").into(), 0, "").into(),
                         row: 22
                     },
-                    VerifyFailure::Constraint {
+                    VerifyFailure::ConstraintNotSatisfied {
                         constraint: ((1, "final z = 0").into(), 0, "").into(),
                         row: 45
                     }
diff --git a/src/circuit/gadget/utilities/enable_flag.rs b/src/circuit/gadget/utilities/enable_flag.rs
index 3424369e..01227fb6 100644
--- a/src/circuit/gadget/utilities/enable_flag.rs
+++ b/src/circuit/gadget/utilities/enable_flag.rs
@@ -210,7 +210,7 @@ mod tests {
             let prover = MockProver::<Base>::run(3, &circuit, vec![]).unwrap();
             assert_eq!(
                 prover.verify(),
-                Err(vec![VerifyFailure::Constraint {
+                Err(vec![VerifyFailure::ConstraintNotSatisfied {
                     constraint: ((0, "Enable flag").into(), 0, "").into(),
                     row: 1,
                 }])