DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Rename HavePourRequirements to HaveJoinSplitRequirements.

Browse Source
This commit is contained in:
Sean Bowe
2016-07-14 15:23:01 -06:00
parent 942bc46756
commit ee964faf3d
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/coins.cpp
View File

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

2
src/coins.h
View File

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

6
src/main.cpp
View File

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

10
src/test/coins_tests.cpp
View File

@@ -253,7 +253,7 @@ BOOST_AUTO_TEST_CASE(chained_pours)
CMutableTransaction mtx; CMutableTransaction mtx;
mtx.vjoinsplit.push_back(ptx2); 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(ptx2);
mtx.vjoinsplit.push_back(ptx1); 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(ptx1);
mtx.vjoinsplit.push_back(ptx2); 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(ptx2);
mtx.vjoinsplit.push_back(ptx3); 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(ptx2);
mtx.vjoinsplit.push_back(ptx3); mtx.vjoinsplit.push_back(ptx3);
BOOST_CHECK(cache.HavePourRequirements(mtx)); BOOST_CHECK(cache.HaveJoinSplitRequirements(mtx));
} }
} }