Use nullptr instead of NULL in wallet tests
This commit is contained in:
parent
0de659946e
commit
c3eaffdb48
|
@ -1649,13 +1649,13 @@ TEST(WalletTests, SetBestChainIgnoresTxsWithoutShieldedData) {
|
||||||
t.vout[0].nValue = 90*CENT;
|
t.vout[0].nValue = 90*CENT;
|
||||||
t.vout[0].scriptPubKey = scriptPubKey;
|
t.vout[0].scriptPubKey = scriptPubKey;
|
||||||
CWalletTx wtxTransparent {nullptr, t};
|
CWalletTx wtxTransparent {nullptr, t};
|
||||||
wallet.AddToWallet(wtxTransparent, true, NULL);
|
wallet.AddToWallet(wtxTransparent, true, nullptr);
|
||||||
|
|
||||||
// Generate a Sprout transaction that is ours
|
// Generate a Sprout transaction that is ours
|
||||||
auto wtxSprout = GetValidReceive(sk, 10, true);
|
auto wtxSprout = GetValidReceive(sk, 10, true);
|
||||||
auto noteMap = wallet.FindMySproutNotes(wtxSprout);
|
auto noteMap = wallet.FindMySproutNotes(wtxSprout);
|
||||||
wtxSprout.SetSproutNoteData(noteMap);
|
wtxSprout.SetSproutNoteData(noteMap);
|
||||||
wallet.AddToWallet(wtxSprout, true, NULL);
|
wallet.AddToWallet(wtxSprout, true, nullptr);
|
||||||
|
|
||||||
// Generate a Sprout transaction that only involves our transparent address
|
// Generate a Sprout transaction that only involves our transparent address
|
||||||
auto sk2 = libzcash::SproutSpendingKey::random();
|
auto sk2 = libzcash::SproutSpendingKey::random();
|
||||||
|
@ -1664,8 +1664,8 @@ TEST(WalletTests, SetBestChainIgnoresTxsWithoutShieldedData) {
|
||||||
auto wtxTmp = GetValidSpend(sk2, note, 5);
|
auto wtxTmp = GetValidSpend(sk2, note, 5);
|
||||||
CMutableTransaction mtx {wtxTmp};
|
CMutableTransaction mtx {wtxTmp};
|
||||||
mtx.vout[0].scriptPubKey = scriptPubKey;
|
mtx.vout[0].scriptPubKey = scriptPubKey;
|
||||||
CWalletTx wtxSproutTransparent {NULL, mtx};
|
CWalletTx wtxSproutTransparent {nullptr, mtx};
|
||||||
wallet.AddToWallet(wtxSproutTransparent, true, NULL);
|
wallet.AddToWallet(wtxSproutTransparent, true, nullptr);
|
||||||
|
|
||||||
EXPECT_CALL(walletdb, TxnBegin())
|
EXPECT_CALL(walletdb, TxnBegin())
|
||||||
.WillOnce(Return(true));
|
.WillOnce(Return(true));
|
||||||
|
|
Loading…
Reference in New Issue