From c3eaffdb48ae41222e3d6de21460c73074a6f661 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sat, 1 Dec 2018 15:51:00 +0000 Subject: [PATCH] Use nullptr instead of NULL in wallet tests --- src/wallet/gtest/test_wallet.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wallet/gtest/test_wallet.cpp b/src/wallet/gtest/test_wallet.cpp index aed3f1184..f57653ad1 100644 --- a/src/wallet/gtest/test_wallet.cpp +++ b/src/wallet/gtest/test_wallet.cpp @@ -1649,13 +1649,13 @@ TEST(WalletTests, SetBestChainIgnoresTxsWithoutShieldedData) { t.vout[0].nValue = 90*CENT; t.vout[0].scriptPubKey = scriptPubKey; CWalletTx wtxTransparent {nullptr, t}; - wallet.AddToWallet(wtxTransparent, true, NULL); + wallet.AddToWallet(wtxTransparent, true, nullptr); // Generate a Sprout transaction that is ours auto wtxSprout = GetValidReceive(sk, 10, true); auto noteMap = wallet.FindMySproutNotes(wtxSprout); wtxSprout.SetSproutNoteData(noteMap); - wallet.AddToWallet(wtxSprout, true, NULL); + wallet.AddToWallet(wtxSprout, true, nullptr); // Generate a Sprout transaction that only involves our transparent address auto sk2 = libzcash::SproutSpendingKey::random(); @@ -1664,8 +1664,8 @@ TEST(WalletTests, SetBestChainIgnoresTxsWithoutShieldedData) { auto wtxTmp = GetValidSpend(sk2, note, 5); CMutableTransaction mtx {wtxTmp}; mtx.vout[0].scriptPubKey = scriptPubKey; - CWalletTx wtxSproutTransparent {NULL, mtx}; - wallet.AddToWallet(wtxSproutTransparent, true, NULL); + CWalletTx wtxSproutTransparent {nullptr, mtx}; + wallet.AddToWallet(wtxSproutTransparent, true, nullptr); EXPECT_CALL(walletdb, TxnBegin()) .WillOnce(Return(true));