[Refactor] fix WalletTestingSetup fixture

Author: random-zebra

src/wallet/test/wallet_test_fixture.cpp

@@ -1,40 +1,35 @@
-// Copyright (c) 2016 The Bitcoin Core developers
-// Copyright (c) 2020 The PIVX developers
+// Copyright (c) 2016-2021 The Bitcoin Core developers
+// Copyright (c) 2020-2021 The PIVX developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "wallet/test/wallet_test_fixture.h"
 
 #include "rpc/server.h"
 #include "wallet/db.h"
-#include "wallet/wallet.h"
 #include "wallet/rpcwallet.h"
-
-void clean()
-{
-    delete pwalletMain;
-    pwalletMain = nullptr;
-
-    bitdb.Flush(true);
-    bitdb.Reset();
-}
+#include "wallet/wallet.h"
 
 WalletTestingSetup::WalletTestingSetup(const std::string& chainName):
         SaplingTestingSetup(chainName)
 {
-    clean(); // todo: research why we have an initialized bitdb here.
     bitdb.MakeMock();
-    RegisterWalletRPCCommands(tableRPC);
 
     bool fFirstRun;
     std::unique_ptr<CWalletDBWrapper> dbw(new CWalletDBWrapper(&bitdb, "wallet_test.dat"));
     pwalletMain = new CWallet(std::move(dbw));
     pwalletMain->LoadWallet(fFirstRun);
     RegisterValidationInterface(pwalletMain);
+
+    RegisterWalletRPCCommands(tableRPC);
 }
 
 WalletTestingSetup::~WalletTestingSetup()
 {
     UnregisterValidationInterface(pwalletMain);
-    clean();
+    delete pwalletMain;
+    pwalletMain = nullptr;
+
+    bitdb.Flush(true);
+    bitdb.Reset();
 }

src/wallet/test/wallet_test_fixture.h

@@ -1,12 +1,14 @@
-// Copyright (c) 2016 The Bitcoin Core developers
+// Copyright (c) 2016-2021 The Bitcoin Core developers
+// Copyright (c) 2020-2021 The PIVX developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_WALLET_TEST_FIXTURE_H
-#define BITCOIN_WALLET_TEST_FIXTURE_H
+#ifndef PIVX_WALLET_TEST_FIXTURE_H
+#define PIVX_WALLET_TEST_FIXTURE_H
 
 #include "test/librust/sapling_test_fixture.h"
 
+
 /** Testing setup and teardown for wallet.
  */
 struct WalletTestingSetup : public SaplingTestingSetup
@@ -20,5 +22,5 @@ struct WalletRegTestingSetup : public WalletTestingSetup
     WalletRegTestingSetup() : WalletTestingSetup(CBaseChainParams::REGTEST) {}
 };
 
-#endif
+#endif // PIVX_WALLET_TEST_FIXTURE_H