Address review comments

Signed-off-by: Azat Nizametdinov <azat@thirdhash.com>
dtr-org · Feb 4, 2019 · 22b1e2a · 22b1e2a
1 parent 51b2e16
commit 22b1e2a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/src/esperanza/walletextension.cpp b/src/esperanza/walletextension.cpp
@@ -58,7 +58,7 @@ void WalletExtension::ForEachStakeableCoin(Callable f) const {
         continue;
       }
       const CTxOut &coin = coins[outix];
-      if (!m_enclosing_wallet.IsStakeableByMe(coin) || coin.nValue <= 0) {
+      if (!IsStakeableByMe(m_enclosing_wallet, coin.scriptPubKey) || coin.nValue <= 0) {
         continue;
       }
 

diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp
@@ -259,6 +259,7 @@ bool IsStakeableByMe(const CKeyStore &keystore, const CScript &script_pub_key)
     txnouttype which_type;
     Solver(script_pub_key, which_type, solutions);
 
+    // UNIT-E TODO: Restrict to witness programs only once #212 is merged (fixes #48)
     switch (which_type)
     {
         case TX_PUBKEYHASH:

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1452,11 +1452,6 @@ isminetype CWallet::IsMine(const CTxOut& txout) const
     return ::IsMine(*this, txout.scriptPubKey);
 }
 
-bool CWallet::IsStakeableByMe(const CTxOut& txout) const
-{
-    return ::IsStakeableByMe(*this, txout.scriptPubKey);
-}
-
 CAmount CWallet::GetCredit(const CTxOut& txout, const isminefilter& filter) const
 {
     if (!MoneyRange(txout.nValue)) {
@@ -1498,7 +1493,7 @@ CAmount CWallet::GetChange(const CTxOut& txout) const
 bool CWallet::IsMine(const CTransaction& tx) const
 {
     for (const CTxOut& txout : tx.vout) {
-        if (IsMine(txout) || IsStakeableByMe(txout)) {
+        if (IsMine(txout) || ::IsStakeableByMe(*this, txout.scriptPubKey)) {
             return true;
         }
     }

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -1042,7 +1042,6 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface
      */
     CAmount GetDebit(const CTxIn& txin, const isminefilter& filter) const;
     isminetype IsMine(const CTxOut& txout) const;
-    bool IsStakeableByMe(const CTxOut& txout) const;
     CAmount GetCredit(const CTxOut& txout, const isminefilter& filter) const;
     bool IsChange(const CTxOut& txout) const;
     CAmount GetChange(const CTxOut& txout) const;