diff --git a/src/coins.cpp b/src/coins.cpp index c8bd65a9d..6bdd3a1bd 100644 --- a/src/coins.cpp +++ b/src/coins.cpp @@ -185,7 +185,7 @@ void CCoinsViewCache::PopAnchor(const uint256 &newrt) { } } -void CCoinsViewCache::SetSerial(const uint256 &serial, bool spent) { +void CCoinsViewCache::SetNullifier(const uint256 &serial, bool spent) { std::pair ret = cacheSerials.insert(std::make_pair(serial, CSerialsCacheEntry())); ret.first->second.entered = spent; ret.first->second.flags |= CSerialsCacheEntry::DIRTY; diff --git a/src/coins.h b/src/coins.h index 219583b10..e1bf18cf1 100644 --- a/src/coins.h +++ b/src/coins.h @@ -473,7 +473,7 @@ public: void PopAnchor(const uint256 &rt); // Marks a serial as spent or not. - void SetSerial(const uint256 &serial, bool spent); + void SetNullifier(const uint256 &serial, bool spent); /** * Return a pointer to CCoins in the cache, or NULL if not found. This is diff --git a/src/main.cpp b/src/main.cpp index cdc8b4104..3b50dc48f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1588,7 +1588,7 @@ void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCach // spend nullifiers BOOST_FOREACH(const JSDescription &pour, tx.vjoinsplit) { BOOST_FOREACH(const uint256 &serial, pour.nullifiers) { - inputs.SetSerial(serial, true); + inputs.SetNullifier(serial, true); } } @@ -1910,7 +1910,7 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex // unspend nullifiers BOOST_FOREACH(const JSDescription &pour, tx.vjoinsplit) { BOOST_FOREACH(const uint256 &serial, pour.nullifiers) { - view.SetSerial(serial, false); + view.SetNullifier(serial, false); } } diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp index 40c0a6cc0..3d4d4fda1 100644 --- a/src/test/coins_tests.cpp +++ b/src/test/coins_tests.cpp @@ -171,14 +171,14 @@ BOOST_AUTO_TEST_CASE(serials_test) uint256 myserial = GetRandHash(); BOOST_CHECK(!cache.GetNullifier(myserial)); - cache.SetSerial(myserial, true); + cache.SetNullifier(myserial, true); BOOST_CHECK(cache.GetNullifier(myserial)); cache.Flush(); CCoinsViewCacheTest cache2(&base); BOOST_CHECK(cache2.GetNullifier(myserial)); - cache2.SetSerial(myserial, false); + cache2.SetNullifier(myserial, false); BOOST_CHECK(!cache2.GetNullifier(myserial)); cache2.Flush();