Deallocate the public parameters during Shutdown.

This commit is contained in:
Sean Bowe 2016-08-26 14:35:05 -06:00
parent 8b139c2441
commit 7ee82c4361
5 changed files with 10 additions and 2 deletions

View File

@ -208,6 +208,8 @@ void Shutdown()
delete pwalletMain; delete pwalletMain;
pwalletMain = NULL; pwalletMain = NULL;
#endif #endif
delete pzcashParams;
pzcashParams = NULL;
ECC_Stop(); ECC_Stop();
LogPrintf("%s: done\n", __func__); LogPrintf("%s: done\n", __func__);
} }

View File

@ -43,6 +43,7 @@ BasicTestingSetup::BasicTestingSetup()
BasicTestingSetup::~BasicTestingSetup() BasicTestingSetup::~BasicTestingSetup()
{ {
ECC_Stop(); ECC_Stop();
delete pzcashParams;
} }
TestingSetup::TestingSetup() TestingSetup::TestingSetup()

View File

@ -22,5 +22,7 @@ int main(int argc, char **argv)
p->saveProvingKey(pkFile); p->saveProvingKey(pkFile);
p->saveVerifyingKey(vkFile); p->saveVerifyingKey(vkFile);
delete p;
return 0; return 0;
} }

View File

@ -72,6 +72,9 @@ public:
boost::optional<r1cs_ppzksnark_verification_key<ppzksnark_ppT>> vk; boost::optional<r1cs_ppzksnark_verification_key<ppzksnark_ppT>> vk;
boost::optional<std::string> pkPath; boost::optional<std::string> pkPath;
JoinSplitCircuit() {}
~JoinSplitCircuit() {}
static void initialize() { static void initialize() {
LOCK(cs_InitializeParams); LOCK(cs_InitializeParams);
@ -122,8 +125,6 @@ public:
vk = keypair.vk; vk = keypair.vk;
} }
JoinSplitCircuit() {}
bool verify( bool verify(
const ZCProof& proof, const ZCProof& proof,
const uint256& pubKeyHash, const uint256& pubKeyHash,

View File

@ -45,6 +45,8 @@ public:
template<size_t NumInputs, size_t NumOutputs> template<size_t NumInputs, size_t NumOutputs>
class JoinSplit { class JoinSplit {
public: public:
virtual ~JoinSplit() {}
static JoinSplit<NumInputs, NumOutputs>* Generate(); static JoinSplit<NumInputs, NumOutputs>* Generate();
static JoinSplit<NumInputs, NumOutputs>* Unopened(); static JoinSplit<NumInputs, NumOutputs>* Unopened();
static uint256 h_sig(const uint256& randomSeed, static uint256 h_sig(const uint256& randomSeed,