Move ismine to wallet module

dashpay · Jun 19, 2019 · 7c611e2 · 7c611e2
1 parent 413e438
commit 7c611e2
Show file tree

Hide file tree

Showing 13 changed files with 395 additions and 376 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -181,7 +181,6 @@ BITCOIN_CORE_H = \
  rpc/util.h \
  scheduler.h \
  script/descriptor.h \
- script/ismine.h \
  script/sigcache.h \
  script/sign.h \
  script/standard.h \
@@ -223,6 +222,7 @@ BITCOIN_CORE_H = \
  wallet/db.h \
  wallet/feebumper.h \
  wallet/fees.h \
+ wallet/ismine.h \
  wallet/load.h \
  wallet/psbtwallet.h \
  wallet/rpcwallet.h \
@@ -328,6 +328,7 @@ libbitcoin_wallet_a_SOURCES = \
  wallet/db.cpp \
  wallet/feebumper.cpp \
  wallet/fees.cpp \
+ wallet/ismine.cpp \
  wallet/load.cpp \
  wallet/psbtwallet.cpp \
  wallet/rpcdump.cpp \
@@ -458,7 +459,6 @@ libbitcoin_common_a_SOURCES = \
  rpc/util.cpp \
  scheduler.cpp \
  script/descriptor.cpp \
- script/ismine.cpp \
  script/sign.cpp \
  script/standard.cpp \
  versionbitsinfo.cpp \

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
@@ -167,7 +167,8 @@ BITCOIN_TESTS += \
  wallet/test/wallet_tests.cpp \
  wallet/test/wallet_crypto_tests.cpp \
  wallet/test/coinselector_tests.cpp \
- wallet/test/init_tests.cpp
+ wallet/test/init_tests.cpp \
+ wallet/test/ismine_tests.cpp
 
 BITCOIN_TEST_SUITE += \
  wallet/test/wallet_test_fixture.cpp \

diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
@@ -11,7 +11,6 @@
 #include <policy/feerate.h>
 #include <policy/fees.h>
 #include <primitives/transaction.h>
-#include <script/ismine.h>
 #include <script/standard.h>
 #include <support/allocators/secure.h>
 #include <sync.h>
@@ -20,6 +19,7 @@
 #include <util/system.h>
 #include <wallet/feebumper.h>
 #include <wallet/fees.h>
+#include <wallet/ismine.h>
 #include <wallet/rpcwallet.h>
 #include <wallet/load.h>
 #include <wallet/wallet.h>

diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h
@@ -7,7 +7,6 @@
 
 #include <amount.h> // For CAmount
 #include <pubkey.h> // For CKeyID and CScriptID (definitions needed in CTxDestination instantiation)
-#include <script/ismine.h> // For isminefilter, isminetype
 #include <script/standard.h> // For CTxDestination
 #include <support/allocators/secure.h> // For SecureString
 #include <ui_interface.h> // For ChangeType
@@ -25,7 +24,10 @@ class CCoinControl;
 class CFeeRate;
 class CKey;
 class CWallet;
+enum isminetype : unsigned int;
 enum class FeeReason;
+typedef uint8_t isminefilter;
+
 enum class OutputType;
 struct CRecipient;
 

diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
@@ -21,6 +21,7 @@
 #include <timedata.h>
 #include <util/system.h>
 #include <policy/policy.h>
+#include <wallet/ismine.h>
 
 #include <stdint.h>
 #include <string>

diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
@@ -7,6 +7,7 @@
 #include <chain.h>
 #include <interfaces/wallet.h>
 #include <key_io.h>
+#include <wallet/ismine.h>
 
 #include <stdint.h>
 

diff --git a/src/test/script_p2sh_tests.cpp b/src/test/script_p2sh_tests.cpp
@@ -11,7 +11,6 @@
 #include <script/script_error.h>
 #include <policy/settings.h>
 #include <script/sign.h>
-#include <script/ismine.h>
 #include <test/setup_common.h>
 
 #include <vector>
@@ -98,7 +97,6 @@ BOOST_AUTO_TEST_CASE(sign)
  txTo[i].vin[0].prevout.n = i;
  txTo[i].vin[0].prevout.hash = txFrom.GetHash();
  txTo[i].vout[0].nValue = 1;
- BOOST_CHECK_MESSAGE(IsMine(keystore, txFrom.vout[i].scriptPubKey), strprintf("IsMine %d", i));
  }
  for (int i = 0; i < 8; i++)
  {
@@ -195,7 +193,6 @@ BOOST_AUTO_TEST_CASE(set)
  txTo[i].vin[0].prevout.hash = txFrom.GetHash();
  txTo[i].vout[0].nValue = 1*CENT;
  txTo[i].vout[0].scriptPubKey = inner[i];
- BOOST_CHECK_MESSAGE(IsMine(keystore, txFrom.vout[i].scriptPubKey), strprintf("IsMine %d", i));
  }
  for (int i = 0; i < 4; i++)
  {