zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto merge of #4484 - defuse:fix-undefined-behavior-in-bitcoin-test, r=str4d 

Fix undefined behavior in the test_bitcoin tests
This commit is contained in:
Homu 2020-10-01 15:19:39 +00:00
parent a983344931 3693b96ed4
commit eb4c9ea0a3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/consensus/params.h
View File

@ -168,7 +168,7 @@ struct Params {
uint256 hashGenesisBlock; uint256 hashGenesisBlock;
bool fCoinbaseMustBeShielded; bool fCoinbaseMustBeShielded = false;
/** Needs to evenly divide MAX_SUBSIDY to avoid rounding errors. */ /** Needs to evenly divide MAX_SUBSIDY to avoid rounding errors. */
int nSubsidySlowStartInterval; int nSubsidySlowStartInterval;

2
src/wallet/test/rpc_wallet_tests.cpp
View File

@ -2021,7 +2021,7 @@ BOOST_AUTO_TEST_CASE(rpc_z_mergetoaddress_internals)
TEST_FRIEND_AsyncRPCOperation_mergetoaddress proxy(ptr); TEST_FRIEND_AsyncRPCOperation_mergetoaddress proxy(ptr);
// Enable test mode so tx is not sent and proofs are not generated // Enable test mode so tx is not sent and proofs are not generated
static_cast<AsyncRPCOperation_sendmany *>(operation.get())->testmode = true; static_cast<AsyncRPCOperation_mergetoaddress *>(operation.get())->testmode = true;
MergeToAddressJSInfo info; MergeToAddressJSInfo info;
std::vector<boost::optional < SproutWitness>> witnesses; std::vector<boost::optional < SproutWitness>> witnesses;