Rename HavePourRequirements to HaveJoinSplitRequirements.

src/coins.cpp

@@ -390,7 +390,7 @@ CAmount CCoinsViewCache::GetValueIn(const CTransaction& tx) const
     return nResult;
 }
 
-bool CCoinsViewCache::HavePourRequirements(const CTransaction& tx) const
+bool CCoinsViewCache::HaveJoinSplitRequirements(const CTransaction& tx) const
 {
     boost::unordered_map<uint256, ZCIncrementalMerkleTree, CCoinsKeyHasher> intermediates;
 

src/coins.h

@@ -516,7 +516,7 @@ public:
     bool HaveInputs(const CTransaction& tx) const;
 
     //! Check whether all pour requirements (anchors/serials) are satisfied
-    bool HavePourRequirements(const CTransaction& tx) const;
+    bool HaveJoinSplitRequirements(const CTransaction& tx) const;
 
     //! Return priority of tx at height nHeight
     double GetPriority(const CTransaction &tx, int nHeight) const;

src/main.cpp

@@ -1145,7 +1145,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
                                  REJECT_DUPLICATE, "bad-txns-inputs-spent");
 
         // are the pour's requirements met?
-        if (!view.HavePourRequirements(tx))
+        if (!view.HaveJoinSplitRequirements(tx))
             return state.Invalid(error("AcceptToMemoryPool: pour requirements not met"),
                                  REJECT_DUPLICATE, "bad-txns-pour-requirements-not-met");
 
@@ -1623,7 +1623,7 @@ bool NonContextualCheckInputs(const CTransaction& tx, CValidationState &state, c
             return state.Invalid(error("CheckInputs(): %s inputs unavailable", tx.GetHash().ToString()));
 
         // are the pour's requirements met?
-        if (!inputs.HavePourRequirements(tx))
+        if (!inputs.HaveJoinSplitRequirements(tx))
             return state.Invalid(error("CheckInputs(): %s pour requirements not met", tx.GetHash().ToString()));
 
         CAmount nValueIn = 0;
@@ -2131,7 +2131,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
                                  REJECT_INVALID, "bad-txns-inputs-missingorspent");
 
             // are the pour's requirements met?
-            if (!view.HavePourRequirements(tx))
+            if (!view.HaveJoinSplitRequirements(tx))
                 return state.DoS(100, error("ConnectBlock(): pour requirements not met"),
                                  REJECT_INVALID, "bad-txns-pour-requirements-not-met");
 

src/test/coins_tests.cpp

@@ -253,7 +253,7 @@ BOOST_AUTO_TEST_CASE(chained_pours)
         CMutableTransaction mtx;
         mtx.vjoinsplit.push_back(ptx2);
 
-        BOOST_CHECK(!cache.HavePourRequirements(mtx));
+        BOOST_CHECK(!cache.HaveJoinSplitRequirements(mtx));
     }
 
     {
@@ -263,7 +263,7 @@ BOOST_AUTO_TEST_CASE(chained_pours)
         mtx.vjoinsplit.push_back(ptx2);
         mtx.vjoinsplit.push_back(ptx1);
 
-        BOOST_CHECK(!cache.HavePourRequirements(mtx));
+        BOOST_CHECK(!cache.HaveJoinSplitRequirements(mtx));
     }
 
     {
@@ -271,7 +271,7 @@ BOOST_AUTO_TEST_CASE(chained_pours)
         mtx.vjoinsplit.push_back(ptx1);
         mtx.vjoinsplit.push_back(ptx2);
 
-        BOOST_CHECK(cache.HavePourRequirements(mtx));
+        BOOST_CHECK(cache.HaveJoinSplitRequirements(mtx));
     }
 
     {
@@ -280,7 +280,7 @@ BOOST_AUTO_TEST_CASE(chained_pours)
         mtx.vjoinsplit.push_back(ptx2);
         mtx.vjoinsplit.push_back(ptx3);
 
-        BOOST_CHECK(cache.HavePourRequirements(mtx));
+        BOOST_CHECK(cache.HaveJoinSplitRequirements(mtx));
     }
 
     {
@@ -290,7 +290,7 @@ BOOST_AUTO_TEST_CASE(chained_pours)
         mtx.vjoinsplit.push_back(ptx2);
         mtx.vjoinsplit.push_back(ptx3);
 
-        BOOST_CHECK(cache.HavePourRequirements(mtx));
+        BOOST_CHECK(cache.HaveJoinSplitRequirements(mtx));
     }
 }