twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-22 12:34:24 +00:00
Code Issues Projects Releases Wiki Activity

fix asserts to support NDEBUG

Browse Source
This commit is contained in:
Denis Ryabov 2014-11-20 19:09:53 +03:00
parent 5379d2a7de
commit 6de0e2036d
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/key.cpp
View File

@ -164,8 +164,10 @@ public:
void SetSecretBytes(const unsigned char vch[32]) { void SetSecretBytes(const unsigned char vch[32]) {
BIGNUM bn; BIGNUM bn;
BN_init(&bn); BN_init(&bn);
assert(BN_bin2bn(vch, 32, &bn)); bool check = BN_bin2bn(vch, 32, &bn);
assert(EC_KEY_regenerate_key(pkey, &bn)); assert(check);
check = EC_KEY_regenerate_key(pkey, &bn);
assert(check);
BN_clear_free(&bn); BN_clear_free(&bn);
} }
@ -210,7 +212,8 @@ public:
bool Sign(const uint256 &hash, std::vector<unsigned char>& vchSig) { bool Sign(const uint256 &hash, std::vector<unsigned char>& vchSig) {
unsigned int nSize = ECDSA_size(pkey); unsigned int nSize = ECDSA_size(pkey);
vchSig.resize(nSize); // Make sure it is big enough vchSig.resize(nSize); // Make sure it is big enough
assert(ECDSA_sign(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], &nSize, pkey)); bool check = ECDSA_sign(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], &nSize, pkey);
assert(check);
vchSig.resize(nSize); // Shrink to fit actual size vchSig.resize(nSize); // Shrink to fit actual size
return true; return true;
} }

6
src/main.cpp
View File

@ -1264,7 +1264,8 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C
} }
// add this block to the view's block chain // add this block to the view's block chain
assert(view.SetBestBlock(pindex)); bool check = view.SetBestBlock(pindex);
assert(check);
// Watch for transactions paying to me // Watch for transactions paying to me
for (unsigned int i = 0; i < block.vtx.size(); i++) for (unsigned int i = 0; i < block.vtx.size(); i++)
@ -1368,7 +1369,8 @@ bool SetBestChain(CValidationState &state, CBlockIndex* pindexNew)
// Flush changes to global coin state // Flush changes to global coin state
int64 nStart = GetTimeMicros(); int64 nStart = GetTimeMicros();
int nModified = view.GetCacheSize(); int nModified = view.GetCacheSize();
assert(view.Flush()); bool check = view.Flush();
assert(check);
int64 nTime = GetTimeMicros() - nStart; int64 nTime = GetTimeMicros() - nStart;
if (fBenchmark) if (fBenchmark)
printf("- Flush %i transactions: %.2fms (%.4fms/tx)\n", nModified, 0.001 * nTime, 0.001 * nTime / nModified); printf("- Flush %i transactions: %.2fms (%.4fms/tx)\n", nModified, 0.001 * nTime, 0.001 * nTime / nModified);