Rename NullifierType to ShieldedType.

2018-04-25 17:55:33 -06:00
parent 2f23a656fb
commit 28d20bdb11
11 changed files with 43 additions and 43 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1305,13 +1305,13 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
    }
    BOOST_FOREACH(const JSDescription &joinsplit, tx.vjoinsplit) {
        BOOST_FOREACH(const uint256 &nf, joinsplit.nullifiers) {
-            if (pool.nullifierExists(nf, SPROUT_NULLIFIER)) {
+            if (pool.nullifierExists(nf, SPROUT)) {
                return false;
            }
        }
    }
    for (const SpendDescription &spendDescription : tx.vShieldedSpend) {
-        if (pool.nullifierExists(spendDescription.nullifier, SAPLING_NULLIFIER)) {
+        if (pool.nullifierExists(spendDescription.nullifier, SAPLING)) {
            return false;
        }
    }