Auto merge of #3439 - ebfull:fix-ecc, r=ebfull
Don't call ECC_Start/ECC_Stop outside the test harness.
This commit is contained in:
commit
16117c0d5a
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -208,6 +208,4 @@ TEST(paymentdisclosure, mainnet) {
|
|||
#if DUMP_DATABASE_TO_STDOUT == true
|
||||
mydb.DebugDumpAllStdout();
|
||||
#endif
|
||||
|
||||
ECC_Stop();
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -350,7 +350,5 @@ TEST(wallet_zkeys_tests, write_cryptedzkey_direct_to_db) {
|
|||
|
||||
wallet2.GetSpendingKey(paymentAddress2, keyOut);
|
||||
ASSERT_EQ(paymentAddress2, keyOut.address());
|
||||
|
||||
ECC_Stop();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue