Merge pull request #1722 from div72/patch-1

refactor: Change return type of IsMine to isminetype && move wallet files to wallet directory

Author: jamescowens

src/Makefile.am

@@ -70,14 +70,12 @@ GRIDCOIN_CORE_H = \
 	block.h \
 	boinc.h \
 	checkpoints.h \
-	coincontrol.h \
 	compat.h \
 	compat/byteswap.h \
 	compat/endian.h \
 	contract/polls.h \
 	contract/rain.h \
 	crypter.h \
-	db.h \
     fs.h \
 	fwd.h \
 	global_objects.hpp \
@@ -150,8 +148,12 @@ GRIDCOIN_CORE_H = \
 	util/time.h \
 	util.h \
 	version.h \
-	walletdb.h \
-	wallet.h
+	wallet/coincontrol.h \
+	wallet/db.h \
+	wallet/walletdb.h \
+	wallet/wallet.h \
+	wallet/ismine.h
+
 
 GRIDCOIN_CORE_CPP = addrdb.cpp \
     addrman.cpp \
@@ -166,7 +168,6 @@ GRIDCOIN_CORE_CPP = addrdb.cpp \
 	contract/polls.cpp \
 	contract/rain.cpp \
 	crypter.cpp \
-	db.cpp \
     fs.cpp \
 	gridcoin.cpp \
 	init.cpp \
@@ -194,14 +195,12 @@ GRIDCOIN_CORE_CPP = addrdb.cpp \
 	contract/rpccontract.cpp \
 	rpcblockchain.cpp \
 	rpcclient.cpp \
-	rpcdump.cpp \
 	rpcmisc.cpp \
 	rpcmining.cpp \
 	rpcnet.cpp \
 	rpcprotocol.cpp \
 	rpcrawtransaction.cpp \
 	rpcserver.cpp \
-	rpcwallet.cpp \
 	rpcdataacq.cpp \
 	scraper_net.cpp \
 	scraper/http.cpp \
@@ -223,8 +222,11 @@ GRIDCOIN_CORE_CPP = addrdb.cpp \
 	util/time.cpp \
 	util.cpp \
 	version.cpp \
-	wallet.cpp \
-	walletdb.cpp
+	wallet/db.cpp \
+	wallet/rpcdump.cpp \
+	wallet/rpcwallet.cpp \
+	wallet/wallet.cpp \
+	wallet/walletdb.cpp
 
 
 obj/build.h: FORCE

src/backup.cpp

@@ -2,8 +2,8 @@
 // Backup related functions are placed here to keep vital sections of
 // code contained while maintaining clean code.
 
-#include "walletdb.h"
-#include "wallet.h"
+#include "wallet/walletdb.h"
+#include "wallet/wallet.h"
 #include "util.h"
 
 #include <boost/filesystem.hpp>

src/gridcoinresearchd.cpp

@@ -10,7 +10,7 @@
 #include "util.h"
 #include "net.h"
 #include "txdb.h"
-#include "walletdb.h"
+#include "wallet/walletdb.h"
 #include "init.h"
 #include "rpcserver.h"
 #include "rpcclient.h"

src/init.cpp

@@ -8,7 +8,7 @@
 #include "util.h"
 #include "net.h"
 #include "txdb.h"
-#include "walletdb.h"
+#include "wallet/walletdb.h"
 #include "banman.h"
 #include "rpcserver.h"
 #include "init.h"

src/init.h

@@ -5,7 +5,7 @@
 #ifndef BITCOIN_INIT_H
 #define BITCOIN_INIT_H
 
-#include "wallet.h"
+#include "wallet/wallet.h"
 #include <boost/thread.hpp>
 
 extern CWallet* pwalletMain;

src/main.cpp

@@ -828,8 +828,8 @@ std::string DefaultWalletAddress()
         {
             const CBitcoinAddress& address = item.first;
             const std::string& strName = item.second;
-            bool fMine = IsMine(*pwalletMain, address.Get());
-            if (fMine && strName == "Default")
+            isminetype fMine = IsMine(*pwalletMain, address.Get());
+            if ((fMine != ISMINE_NO) && strName == "Default")
             {
                 sDefaultWalletAddress=CBitcoinAddress(address).ToString();
                 return sDefaultWalletAddress;
@@ -841,8 +841,8 @@ std::string DefaultWalletAddress()
         {
             const CBitcoinAddress& address = item.first;
             //const std::string& strName = item.second;
-            bool fMine = IsMine(*pwalletMain, address.Get());
-            if (fMine)
+            isminetype fMine = IsMine(*pwalletMain, address.Get());
+            if (fMine != ISMINE_NO)
             {
                 sDefaultWalletAddress=CBitcoinAddress(address).ToString();
                 return sDefaultWalletAddress;

src/main.h

@@ -13,6 +13,7 @@
 #include "sync.h"
 #include "script.h"
 #include "scrypt.h"
+#include "wallet/ismine.h"
 
 #include <map>
 #include <unordered_map>

src/miner.h

@@ -7,7 +7,7 @@
 #define NOVACOIN_MINER_H
 
 #include "main.h"
-#include "wallet.h"
+#include "wallet/wallet.h"
 
 // struct CMinerStatus is in wallet.h to prevent a circular header reference issue
 

src/net.cpp

@@ -7,7 +7,7 @@
 #include "config/gridcoin-config.h"
 #endif
 
-#include "db.h"
+#include "wallet/db.h"
 #include "banman.h"
 #include "net.h"
 #include "init.h"

src/neuralnet/contract/contract.cpp

@@ -9,7 +9,7 @@
 #include "neuralnet/researcher.h"
 #include "neuralnet/superblock.h"
 #include "util.h"
-#include "wallet.h"
+#include "wallet/wallet.h"
 
 using namespace NN;