remove redundant verify methods

Author: ledwards2225

barretenberg/cpp/src/barretenberg/api/api_client_ivc.cpp

@@ -154,7 +154,8 @@ bool ClientIVCAPI::prove_and_verify(const std::filesystem::path& input_path)
     std::shared_ptr<ClientIVC> ivc = steps.accumulate();
     // Construct the hiding kernel as the final step of the IVC
 
-    const bool verified = ivc->prove_and_verify();
+    auto proof = ivc->prove();
+    const bool verified = ClientIVC::verify(proof, ivc->get_vk());
     return verified;
 }
 

barretenberg/cpp/src/barretenberg/bbapi/bbapi_client_ivc.cpp

@@ -81,7 +81,7 @@ ClientIvcProve::Response ClientIvcProve::execute(BBApiRequest& request) &&
     // We verify this proof. Another bb call to verify has some overhead of loading VK/proof/SRS,
     // and it is mysterious if this transaction fails later in the lifecycle.
     info("ClientIvcProve - verifying the generated proof as a sanity check");
-    if (!request.ivc_in_progress->verify(proof)) {
+    if (!request.ivc_in_progress->verify(proof, request.ivc_in_progress->get_vk())) {
         throw_or_abort("Failed to verify the generated proof!");
     }
 

barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.cpp

@@ -601,17 +601,6 @@ bool ClientIVC::verify(const Proof& proof, const VerificationKey& vk)
     return goblin_verified && mega_verified;
 }
 
-/**
- * @brief Verify a full proof of the IVC
- *
- * @param proof
- * @return bool
- */
-bool ClientIVC::verify(const Proof& proof) const
-{
-    return verify(proof, get_vk());
-}
-
 /**
  * @brief Internal method for constructing a decider proof
  *
@@ -626,30 +615,6 @@ HonkProof ClientIVC::construct_decider_proof(const std::shared_ptr<Transcript>&
     return decider_prover.export_proof();
 }
 
-/**
- * @brief Construct and verify a proof for the IVC
- * @note Use of this method only makes sense when the prover and verifier are the same entity, e.g. in
- * development/testing.
- *
- */
-bool ClientIVC::prove_and_verify()
-{
-    auto start = std::chrono::steady_clock::now();
-    const auto proof = prove();
-    auto end = std::chrono::steady_clock::now();
-    auto diff = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
-    vinfo("time to call ClientIVC::prove: ", diff.count(), " ms.");
-
-    start = end;
-    const bool verified = verify(proof);
-    end = std::chrono::steady_clock::now();
-
-    diff = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
-    vinfo("time to verify ClientIVC proof: ", diff.count(), " ms.");
-
-    return verified;
-}
-
 // Proof methods
 size_t ClientIVC::Proof::size() const
 {

barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.hpp

@@ -273,10 +273,6 @@ class ClientIVC {
 
     static bool verify(const Proof& proof, const VerificationKey& vk);
 
-    bool verify(const Proof& proof) const;
-
-    bool prove_and_verify();
-
     HonkProof construct_decider_proof(const std::shared_ptr<Transcript>& transcript);
 
     VerificationKey get_vk() const;

barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.test.cpp

@@ -108,7 +108,8 @@ TEST_F(ClientIVCTests, BadProofFailure)
         for (size_t idx = 0; idx < NUM_CIRCUITS; ++idx) {
             circuit_producer.construct_and_accumulate_next_circuit(ivc, settings);
         }
-        EXPECT_TRUE(ivc.prove_and_verify());
+        auto proof = ivc.prove();
+        EXPECT_TRUE(ClientIVC::verify(proof, ivc.get_vk()));
     }
 
     // The IVC throws an exception if the FIRST fold proof is tampered with
@@ -135,7 +136,8 @@ TEST_F(ClientIVCTests, BadProofFailure)
                                   num_public_inputs); // tamper with first proof
             }
         }
-        EXPECT_FALSE(ivc.prove_and_verify());
+        auto proof = ivc.prove();
+        EXPECT_FALSE(ClientIVC::verify(proof, ivc.get_vk()));
     }
 
     // The IVC fails if the SECOND fold proof is tampered with
@@ -156,7 +158,8 @@ TEST_F(ClientIVCTests, BadProofFailure)
                                   circuit.num_public_inputs()); // tamper with second proof
             }
         }
-        EXPECT_FALSE(ivc.prove_and_verify());
+        auto proof = ivc.prove();
+        EXPECT_FALSE(ClientIVC::verify(proof, ivc.get_vk()));
     }
 
     EXPECT_TRUE(true);
@@ -309,7 +312,8 @@ TEST_F(ClientIVCTests, StructuredTraceOverflow)
         log2_num_gates += 1;
     }
 
-    EXPECT_TRUE(ivc.prove_and_verify());
+    auto proof = ivc.prove();
+    EXPECT_TRUE(ClientIVC::verify(proof, ivc.get_vk()));
 };
 
 /**
@@ -345,7 +349,8 @@ TEST_F(ClientIVCTests, DynamicTraceOverflow)
         }
 
         EXPECT_EQ(check_accumulator_target_sum_manual(ivc.prover_accumulator), true);
-        EXPECT_TRUE(ivc.prove_and_verify());
+        auto proof = ivc.prove();
+        EXPECT_TRUE(ClientIVC::verify(proof, ivc.get_vk()));
     }
 }
 
@@ -417,5 +422,6 @@ TEST_F(ClientIVCTests, DatabusFailure)
         ivc.accumulate(circuit, vk);
     }
 
-    EXPECT_FALSE(ivc.prove_and_verify());
+    auto proof = ivc.prove();
+    EXPECT_FALSE(ClientIVC::verify(proof, ivc.get_vk()));
 };

barretenberg/cpp/src/barretenberg/client_ivc/test_bench_shared.hpp

@@ -13,23 +13,6 @@
 
 namespace bb {
 
-/**
- * @brief Verify an IVC proof
- *
- */
-bool verify_ivc(ClientIVC::Proof& proof, ClientIVC& ivc)
-{
-    bool verified = ivc.verify(proof);
-
-    // This is a benchmark, not a test, so just print success or failure to the log
-    if (verified) {
-        info("IVC successfully verified!");
-    } else {
-        info("IVC failed to verify.");
-    }
-    return verified;
-}
-
 /**
  * @brief Perform a specified number of circuit accumulation rounds
  *

barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_integration.test.cpp

@@ -511,7 +511,7 @@ TEST_F(AcirIntegrationTest, DISABLED_ClientIVCMsgpackInputs)
     std::shared_ptr<ClientIVC> ivc = steps.accumulate();
     ClientIVC::Proof proof = ivc->prove();
 
-    EXPECT_TRUE(ivc->verify(proof));
+    EXPECT_TRUE(ivc->verify(proof, ivc->get_vk()));
 }
 
 /**

barretenberg/cpp/src/barretenberg/dsl/acir_format/pg_recursion_constraint.test.cpp

@@ -313,7 +313,8 @@ TEST_F(IvcRecursionConstraintTest, AccumulateSingleApp)
     // add the trailing kernels
     construct_and_accumulate_trailing_kernels(ivc, trace_settings);
 
-    EXPECT_TRUE(ivc->prove_and_verify());
+    auto proof = ivc->prove();
+    EXPECT_TRUE(ClientIVC::verify(proof, ivc->get_vk()));
 }
 
 /**
@@ -343,7 +344,8 @@ TEST_F(IvcRecursionConstraintTest, AccumulateTwoApps)
     // Accumulate the trailing kernels
     construct_and_accumulate_trailing_kernels(ivc, trace_settings);
 
-    EXPECT_TRUE(ivc->prove_and_verify());
+    auto proof = ivc->prove();
+    EXPECT_TRUE(ClientIVC::verify(proof, ivc->get_vk()));
 }
 
 // Test generation of "init" kernel VK via dummy IVC data
@@ -584,7 +586,8 @@ TEST_F(IvcRecursionConstraintTest, RecursiveVerifierAppCircuitTest)
 
     construct_and_accumulate_trailing_kernels(ivc, trace_settings);
 
-    EXPECT_TRUE(ivc->prove_and_verify());
+    auto proof = ivc->prove();
+    EXPECT_TRUE(ClientIVC::verify(proof, ivc->get_vk()));
 }
 
 /**
@@ -607,5 +610,6 @@ TEST_F(IvcRecursionConstraintTest, BadRecursiveVerifierAppCircuitTest)
     construct_and_accumulate_trailing_kernels(ivc, trace_settings);
 
     // We expect the CIVC proof to fail due to the app with a failed UH recursive verification
-    EXPECT_FALSE(ivc->prove_and_verify());
+    auto proof = ivc->prove();
+    EXPECT_FALSE(ClientIVC::verify(proof, ivc->get_vk()));
 }