Rename IsFromMe(nullifier) to IsSproutNullifierFromMe(nullifier).

zcash · Aug 8, 2018 · 037cacf · 037cacf
1 parent 78584ef
commit 037cacf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1554,7 +1554,7 @@ mapSaplingNoteData_t CWallet::FindMySaplingNotes(const CTransaction &tx) const
     return noteData;
 }
 
-bool CWallet::IsFromMe(const uint256& nullifier) const
+bool CWallet::IsSproutNullifierFromMe(const uint256& nullifier) const
 {
     {
         LOCK(cs_wallet);
@@ -1707,7 +1707,7 @@ bool CWallet::IsFromMe(const CTransaction& tx) const
     }
     for (const JSDescription& jsdesc : tx.vjoinsplit) {
         for (const uint256& nullifier : jsdesc.nullifiers) {
-            if (IsFromMe(nullifier)) {
+            if (IsSproutNullifierFromMe(nullifier)) {
                 return true;
             }
         }
@@ -1841,7 +1841,7 @@ void CWalletTx::GetAmounts(list<COutputEntry>& listReceived,
     bool isFromMyZaddr = false;
     for (const JSDescription& js : vjoinsplit) {
         for (const uint256& nullifier : js.nullifiers) {
-            if (pwallet->IsFromMe(nullifier)) {
+            if (pwallet->IsSproutNullifierFromMe(nullifier)) {
                 isFromMyZaddr = true;
                 break;
             }
@@ -1868,7 +1868,7 @@ void CWalletTx::GetAmounts(list<COutputEntry>& listReceived,
 
             // Check input side
             for (const uint256& nullifier : js.nullifiers) {
-                if (pwallet->IsFromMe(nullifier)) {
+                if (pwallet->IsSproutNullifierFromMe(nullifier)) {
                     fMyJSDesc = true;
                     break;
                 }

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -1098,7 +1098,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
         uint8_t n) const;
     mapSproutNoteData_t FindMySproutNotes(const CTransaction& tx) const;
     mapSaplingNoteData_t FindMySaplingNotes(const CTransaction& tx) const;
-    bool IsFromMe(const uint256& nullifier) const;
+    bool IsSproutNullifierFromMe(const uint256& nullifier) const;
     void GetSproutNoteWitnesses(
          std::vector<JSOutPoint> notes,
          std::vector<boost::optional<SproutWitness>>& witnesses,