From 262d21bcbbb8dd5385fb82c6b46ef2771dff1128 Mon Sep 17 00:00:00 2001
From: Sean Bowe <ewillbefull@gmail.com>
Date: Wed, 1 Aug 2018 16:45:12 -0600
Subject: [PATCH 1/2] Don't call ECC_Start/ECC_Stop outside the test harness.

---
 src/gtest/test_paymentdisclosure.cpp   | 2 --
 src/gtest/test_transaction_builder.cpp | 2 --
 src/wallet/gtest/test_wallet_zkeys.cpp | 2 --
 3 files changed, 6 deletions(-)

diff --git a/src/gtest/test_paymentdisclosure.cpp b/src/gtest/test_paymentdisclosure.cpp
index 89be17dae..ce1322dbb 100644
--- a/src/gtest/test_paymentdisclosure.cpp
+++ b/src/gtest/test_paymentdisclosure.cpp
@@ -208,6 +208,4 @@ TEST(paymentdisclosure, mainnet) {
 #if DUMP_DATABASE_TO_STDOUT == true
     mydb.DebugDumpAllStdout();
 #endif
-
-    ECC_Stop();
 }
diff --git a/src/gtest/test_transaction_builder.cpp b/src/gtest/test_transaction_builder.cpp
index 2ad90942b..335cf26d5 100644
--- a/src/gtest/test_transaction_builder.cpp
+++ b/src/gtest/test_transaction_builder.cpp
@@ -14,8 +14,6 @@ static const std::string tSecretRegtest = "cND2ZvtabDbJ1gucx9GWH6XT9kgTAqfb6cotP
 
 TEST(TransactionBuilder, Invoke)
 {
-    ECC_Start();
-
     SelectParams(CBaseChainParams::REGTEST);
     UpdateNetworkUpgradeParameters(Consensus::UPGRADE_OVERWINTER, Consensus::NetworkUpgrade::ALWAYS_ACTIVE);
     UpdateNetworkUpgradeParameters(Consensus::UPGRADE_SAPLING, Consensus::NetworkUpgrade::ALWAYS_ACTIVE);
diff --git a/src/wallet/gtest/test_wallet_zkeys.cpp b/src/wallet/gtest/test_wallet_zkeys.cpp
index 9fe107ccc..bb2ca8545 100644
--- a/src/wallet/gtest/test_wallet_zkeys.cpp
+++ b/src/wallet/gtest/test_wallet_zkeys.cpp
@@ -331,7 +331,5 @@ TEST(wallet_zkeys_tests, write_cryptedzkey_direct_to_db) {
     
     wallet2.GetSpendingKey(paymentAddress2, keyOut);
     ASSERT_EQ(paymentAddress2, keyOut.address());
-
-    ECC_Stop();
 }
 

From 80bd573dc2ecd105a6625ef4aa7a5af525eca3fc Mon Sep 17 00:00:00 2001
From: Sean Bowe <ewillbefull@gmail.com>
Date: Wed, 1 Aug 2018 16:53:27 -0600
Subject: [PATCH 2/2] Make changes to gtest ECC behavior suggested by @str4d.

---
 src/gtest/main.cpp                | 6 +++++-
 src/gtest/test_foundersreward.cpp | 3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gtest/main.cpp b/src/gtest/main.cpp
index f3db2a4bb..be7ddd33c 100644
--- a/src/gtest/main.cpp
+++ b/src/gtest/main.cpp
@@ -45,5 +45,9 @@ int main(int argc, char **argv) {
   );
   
   testing::InitGoogleMock(&argc, argv);
-  return RUN_ALL_TESTS();
+  
+  auto ret = RUN_ALL_TESTS();
+
+  ECC_Stop();
+  return ret;
 }
diff --git a/src/gtest/test_foundersreward.cpp b/src/gtest/test_foundersreward.cpp
index a3d2b8c56..12c16ad89 100644
--- a/src/gtest/test_foundersreward.cpp
+++ b/src/gtest/test_foundersreward.cpp
@@ -24,7 +24,6 @@
 //
 #if 0
 TEST(founders_reward_test, create_testnet_2of3multisig) {
-    ECC_Start();
     SelectParams(CBaseChainParams::TESTNET);
     boost::filesystem::path pathTemp = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
     boost::filesystem::create_directories(pathTemp);
@@ -80,8 +79,6 @@ TEST(founders_reward_test, create_testnet_2of3multisig) {
     std::cout << s << std::endl;
 
     pWallet->Flush(true);
-
-    ECC_Stop();
 }
 #endif