mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-25 02:33:24 -03:00
Merge #20575: Do not run functions with necessary side-effects in assert()
5021810650
Make CanFlushToDisk a const member function (practicalswift)281cf99554
Do not run functions with necessary side-effects in assert() (practicalswift) Pull request description: Do not run functions with necessary side-effects in `assert()`. ACKs for top commit: laanwj: Code review ACK5021810650
sipa: utACK5021810650
theStack: Code Review ACK5021810650
🟢 Tree-SHA512: 38b7faccc2f16a499f9b7b1b962b49eb58580b2a2bbf63ea49dcc418a5ecc8f21a0972fa953f66db9509c7239af67cfa2f9266423fd220963d091034d7332b96
This commit is contained in:
commit
1811e488d5
3 changed files with 9 additions and 5 deletions
|
@ -31,12 +31,15 @@ static void CHACHA20_POLY1305_AEAD(benchmark::Bench& bench, size_t buffersize, b
|
||||||
uint32_t len = 0;
|
uint32_t len = 0;
|
||||||
bench.batch(buffersize).unit("byte").run([&] {
|
bench.batch(buffersize).unit("byte").run([&] {
|
||||||
// encrypt or decrypt the buffer with a static key
|
// encrypt or decrypt the buffer with a static key
|
||||||
assert(aead.Crypt(seqnr_payload, seqnr_aad, aad_pos, out.data(), out.size(), in.data(), buffersize, true));
|
const bool crypt_ok_1 = aead.Crypt(seqnr_payload, seqnr_aad, aad_pos, out.data(), out.size(), in.data(), buffersize, true);
|
||||||
|
assert(crypt_ok_1);
|
||||||
|
|
||||||
if (include_decryption) {
|
if (include_decryption) {
|
||||||
// if we decrypt, include the GetLength
|
// if we decrypt, include the GetLength
|
||||||
assert(aead.GetLength(&len, seqnr_aad, aad_pos, in.data()));
|
const bool get_length_ok = aead.GetLength(&len, seqnr_aad, aad_pos, in.data());
|
||||||
assert(aead.Crypt(seqnr_payload, seqnr_aad, aad_pos, out.data(), out.size(), in.data(), buffersize, true));
|
assert(get_length_ok);
|
||||||
|
const bool crypt_ok_2 = aead.Crypt(seqnr_payload, seqnr_aad, aad_pos, out.data(), out.size(), in.data(), buffersize, true);
|
||||||
|
assert(crypt_ok_2);
|
||||||
}
|
}
|
||||||
|
|
||||||
// increase main sequence number
|
// increase main sequence number
|
||||||
|
|
|
@ -562,7 +562,7 @@ public:
|
||||||
|
|
||||||
//! @returns whether or not the CoinsViews object has been fully initialized and we can
|
//! @returns whether or not the CoinsViews object has been fully initialized and we can
|
||||||
//! safely flush this object to disk.
|
//! safely flush this object to disk.
|
||||||
bool CanFlushToDisk() EXCLUSIVE_LOCKS_REQUIRED(cs_main) {
|
bool CanFlushToDisk() const EXCLUSIVE_LOCKS_REQUIRED(cs_main) {
|
||||||
return m_coins_views && m_coins_views->m_cacheview;
|
return m_coins_views && m_coins_views->m_cacheview;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,8 @@ static void add_coin(CWallet& wallet, const CAmount& nValue, int nAge = 6*24, bo
|
||||||
if (spendable) {
|
if (spendable) {
|
||||||
CTxDestination dest;
|
CTxDestination dest;
|
||||||
std::string error;
|
std::string error;
|
||||||
assert(wallet.GetNewDestination(OutputType::BECH32, "", dest, error));
|
const bool destination_ok = wallet.GetNewDestination(OutputType::BECH32, "", dest, error);
|
||||||
|
assert(destination_ok);
|
||||||
tx.vout[nInput].scriptPubKey = GetScriptForDestination(dest);
|
tx.vout[nInput].scriptPubKey = GetScriptForDestination(dest);
|
||||||
}
|
}
|
||||||
if (fIsFromMe) {
|
if (fIsFromMe) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue