@@ -532,7 +532,7 @@ BOOST_AUTO_TEST_CASE(ccoins_serialization)
532532}
533533
534534const static COutPoint OUTPOINT;
535- const static CAmount PRUNED = -1 ;
535+ const static CAmount SPENT = -1 ;
536536const static CAmount ABSENT = -2 ;
537537const static CAmount FAIL = -3 ;
538538const static CAmount VALUE1 = 100 ;
@@ -551,7 +551,7 @@ static void SetCoinsValue(CAmount value, Coin& coin)
551551 assert (value != ABSENT);
552552 coin.Clear ();
553553 assert (coin.IsSpent ());
554- if (value != PRUNED ) {
554+ if (value != SPENT ) {
555555 coin.out .nValue = value;
556556 coin.nHeight = 1 ;
557557 assert (!coin.IsSpent ());
@@ -581,7 +581,7 @@ void GetCoinsMapEntry(const CCoinsMap& map, CAmount& value, char& flags)
581581 flags = NO_ENTRY;
582582 } else {
583583 if (it->second .coin .IsSpent ()) {
584- value = PRUNED ;
584+ value = SPENT ;
585585 } else {
586586 value = it->second .coin .out .nValue ;
587587 }
@@ -634,28 +634,28 @@ BOOST_AUTO_TEST_CASE(ccoins_access)
634634 * Value Value Value Flags Flags
635635 */
636636 CheckAccessCoin (ABSENT, ABSENT, ABSENT, NO_ENTRY , NO_ENTRY );
637- CheckAccessCoin (ABSENT, PRUNED, PRUNED , 0 , 0 );
638- CheckAccessCoin (ABSENT, PRUNED, PRUNED , FRESH , FRESH );
639- CheckAccessCoin (ABSENT, PRUNED, PRUNED , DIRTY , DIRTY );
640- CheckAccessCoin (ABSENT, PRUNED, PRUNED , DIRTY|FRESH, DIRTY|FRESH);
637+ CheckAccessCoin (ABSENT, SPENT , SPENT , 0 , 0 );
638+ CheckAccessCoin (ABSENT, SPENT , SPENT , FRESH , FRESH );
639+ CheckAccessCoin (ABSENT, SPENT , SPENT , DIRTY , DIRTY );
640+ CheckAccessCoin (ABSENT, SPENT , SPENT , DIRTY|FRESH, DIRTY|FRESH);
641641 CheckAccessCoin (ABSENT, VALUE2, VALUE2, 0 , 0 );
642642 CheckAccessCoin (ABSENT, VALUE2, VALUE2, FRESH , FRESH );
643643 CheckAccessCoin (ABSENT, VALUE2, VALUE2, DIRTY , DIRTY );
644644 CheckAccessCoin (ABSENT, VALUE2, VALUE2, DIRTY|FRESH, DIRTY|FRESH);
645- CheckAccessCoin (PRUNED , ABSENT, ABSENT, NO_ENTRY , NO_ENTRY );
646- CheckAccessCoin (PRUNED, PRUNED, PRUNED , 0 , 0 );
647- CheckAccessCoin (PRUNED, PRUNED, PRUNED , FRESH , FRESH );
648- CheckAccessCoin (PRUNED, PRUNED, PRUNED , DIRTY , DIRTY );
649- CheckAccessCoin (PRUNED, PRUNED, PRUNED , DIRTY|FRESH, DIRTY|FRESH);
650- CheckAccessCoin (PRUNED , VALUE2, VALUE2, 0 , 0 );
651- CheckAccessCoin (PRUNED , VALUE2, VALUE2, FRESH , FRESH );
652- CheckAccessCoin (PRUNED , VALUE2, VALUE2, DIRTY , DIRTY );
653- CheckAccessCoin (PRUNED , VALUE2, VALUE2, DIRTY|FRESH, DIRTY|FRESH);
645+ CheckAccessCoin (SPENT , ABSENT, ABSENT, NO_ENTRY , NO_ENTRY );
646+ CheckAccessCoin (SPENT , SPENT , SPENT , 0 , 0 );
647+ CheckAccessCoin (SPENT , SPENT , SPENT , FRESH , FRESH );
648+ CheckAccessCoin (SPENT , SPENT , SPENT , DIRTY , DIRTY );
649+ CheckAccessCoin (SPENT , SPENT , SPENT , DIRTY|FRESH, DIRTY|FRESH);
650+ CheckAccessCoin (SPENT , VALUE2, VALUE2, 0 , 0 );
651+ CheckAccessCoin (SPENT , VALUE2, VALUE2, FRESH , FRESH );
652+ CheckAccessCoin (SPENT , VALUE2, VALUE2, DIRTY , DIRTY );
653+ CheckAccessCoin (SPENT , VALUE2, VALUE2, DIRTY|FRESH, DIRTY|FRESH);
654654 CheckAccessCoin (VALUE1, ABSENT, VALUE1, NO_ENTRY , 0 );
655- CheckAccessCoin (VALUE1, PRUNED, PRUNED , 0 , 0 );
656- CheckAccessCoin (VALUE1, PRUNED, PRUNED , FRESH , FRESH );
657- CheckAccessCoin (VALUE1, PRUNED, PRUNED , DIRTY , DIRTY );
658- CheckAccessCoin (VALUE1, PRUNED, PRUNED , DIRTY|FRESH, DIRTY|FRESH);
655+ CheckAccessCoin (VALUE1, SPENT , SPENT , 0 , 0 );
656+ CheckAccessCoin (VALUE1, SPENT , SPENT , FRESH , FRESH );
657+ CheckAccessCoin (VALUE1, SPENT , SPENT , DIRTY , DIRTY );
658+ CheckAccessCoin (VALUE1, SPENT , SPENT , DIRTY|FRESH, DIRTY|FRESH);
659659 CheckAccessCoin (VALUE1, VALUE2, VALUE2, 0 , 0 );
660660 CheckAccessCoin (VALUE1, VALUE2, VALUE2, FRESH , FRESH );
661661 CheckAccessCoin (VALUE1, VALUE2, VALUE2, DIRTY , DIRTY );
@@ -685,31 +685,31 @@ BOOST_AUTO_TEST_CASE(ccoins_spend)
685685 * Value Value Value Flags Flags
686686 */
687687 CheckSpendCoins (ABSENT, ABSENT, ABSENT, NO_ENTRY , NO_ENTRY );
688- CheckSpendCoins (ABSENT, PRUNED, PRUNED , 0 , DIRTY );
689- CheckSpendCoins (ABSENT, PRUNED , ABSENT, FRESH , NO_ENTRY );
690- CheckSpendCoins (ABSENT, PRUNED, PRUNED , DIRTY , DIRTY );
691- CheckSpendCoins (ABSENT, PRUNED , ABSENT, DIRTY|FRESH, NO_ENTRY );
692- CheckSpendCoins (ABSENT, VALUE2, PRUNED , 0 , DIRTY );
688+ CheckSpendCoins (ABSENT, SPENT , SPENT , 0 , DIRTY );
689+ CheckSpendCoins (ABSENT, SPENT , ABSENT, FRESH , NO_ENTRY );
690+ CheckSpendCoins (ABSENT, SPENT , SPENT , DIRTY , DIRTY );
691+ CheckSpendCoins (ABSENT, SPENT , ABSENT, DIRTY|FRESH, NO_ENTRY );
692+ CheckSpendCoins (ABSENT, VALUE2, SPENT , 0 , DIRTY );
693693 CheckSpendCoins (ABSENT, VALUE2, ABSENT, FRESH , NO_ENTRY );
694- CheckSpendCoins (ABSENT, VALUE2, PRUNED , DIRTY , DIRTY );
694+ CheckSpendCoins (ABSENT, VALUE2, SPENT , DIRTY , DIRTY );
695695 CheckSpendCoins (ABSENT, VALUE2, ABSENT, DIRTY|FRESH, NO_ENTRY );
696- CheckSpendCoins (PRUNED , ABSENT, ABSENT, NO_ENTRY , NO_ENTRY );
697- CheckSpendCoins (PRUNED, PRUNED, PRUNED , 0 , DIRTY );
698- CheckSpendCoins (PRUNED, PRUNED , ABSENT, FRESH , NO_ENTRY );
699- CheckSpendCoins (PRUNED, PRUNED, PRUNED , DIRTY , DIRTY );
700- CheckSpendCoins (PRUNED, PRUNED , ABSENT, DIRTY|FRESH, NO_ENTRY );
701- CheckSpendCoins (PRUNED , VALUE2, PRUNED , 0 , DIRTY );
702- CheckSpendCoins (PRUNED , VALUE2, ABSENT, FRESH , NO_ENTRY );
703- CheckSpendCoins (PRUNED , VALUE2, PRUNED , DIRTY , DIRTY );
704- CheckSpendCoins (PRUNED , VALUE2, ABSENT, DIRTY|FRESH, NO_ENTRY );
705- CheckSpendCoins (VALUE1, ABSENT, PRUNED , NO_ENTRY , DIRTY );
706- CheckSpendCoins (VALUE1, PRUNED, PRUNED , 0 , DIRTY );
707- CheckSpendCoins (VALUE1, PRUNED , ABSENT, FRESH , NO_ENTRY );
708- CheckSpendCoins (VALUE1, PRUNED, PRUNED , DIRTY , DIRTY );
709- CheckSpendCoins (VALUE1, PRUNED , ABSENT, DIRTY|FRESH, NO_ENTRY );
710- CheckSpendCoins (VALUE1, VALUE2, PRUNED , 0 , DIRTY );
696+ CheckSpendCoins (SPENT , ABSENT, ABSENT, NO_ENTRY , NO_ENTRY );
697+ CheckSpendCoins (SPENT , SPENT , SPENT , 0 , DIRTY );
698+ CheckSpendCoins (SPENT , SPENT , ABSENT, FRESH , NO_ENTRY );
699+ CheckSpendCoins (SPENT , SPENT , SPENT , DIRTY , DIRTY );
700+ CheckSpendCoins (SPENT , SPENT , ABSENT, DIRTY|FRESH, NO_ENTRY );
701+ CheckSpendCoins (SPENT , VALUE2, SPENT , 0 , DIRTY );
702+ CheckSpendCoins (SPENT , VALUE2, ABSENT, FRESH , NO_ENTRY );
703+ CheckSpendCoins (SPENT , VALUE2, SPENT , DIRTY , DIRTY );
704+ CheckSpendCoins (SPENT , VALUE2, ABSENT, DIRTY|FRESH, NO_ENTRY );
705+ CheckSpendCoins (VALUE1, ABSENT, SPENT , NO_ENTRY , DIRTY );
706+ CheckSpendCoins (VALUE1, SPENT , SPENT , 0 , DIRTY );
707+ CheckSpendCoins (VALUE1, SPENT , ABSENT, FRESH , NO_ENTRY );
708+ CheckSpendCoins (VALUE1, SPENT , SPENT , DIRTY , DIRTY );
709+ CheckSpendCoins (VALUE1, SPENT , ABSENT, DIRTY|FRESH, NO_ENTRY );
710+ CheckSpendCoins (VALUE1, VALUE2, SPENT , 0 , DIRTY );
711711 CheckSpendCoins (VALUE1, VALUE2, ABSENT, FRESH , NO_ENTRY );
712- CheckSpendCoins (VALUE1, VALUE2, PRUNED , DIRTY , DIRTY );
712+ CheckSpendCoins (VALUE1, VALUE2, SPENT , DIRTY , DIRTY );
713713 CheckSpendCoins (VALUE1, VALUE2, ABSENT, DIRTY|FRESH, NO_ENTRY );
714714}
715715
@@ -742,7 +742,7 @@ static void CheckAddCoinBase(CAmount base_value, CAmount cache_value, CAmount mo
742742template <typename ... Args>
743743static void CheckAddCoin (Args&&... args)
744744{
745- for (const CAmount base_value : {ABSENT, PRUNED , VALUE1})
745+ for (const CAmount base_value : {ABSENT, SPENT , VALUE1})
746746 CheckAddCoinBase (base_value, std::forward<Args>(args)...);
747747}
748748
@@ -758,14 +758,14 @@ BOOST_AUTO_TEST_CASE(ccoins_add)
758758 */
759759 CheckAddCoin (ABSENT, VALUE3, VALUE3, NO_ENTRY , DIRTY|FRESH, false );
760760 CheckAddCoin (ABSENT, VALUE3, VALUE3, NO_ENTRY , DIRTY , true );
761- CheckAddCoin (PRUNED , VALUE3, VALUE3, 0 , DIRTY|FRESH, false );
762- CheckAddCoin (PRUNED , VALUE3, VALUE3, 0 , DIRTY , true );
763- CheckAddCoin (PRUNED , VALUE3, VALUE3, FRESH , DIRTY|FRESH, false );
764- CheckAddCoin (PRUNED , VALUE3, VALUE3, FRESH , DIRTY|FRESH, true );
765- CheckAddCoin (PRUNED , VALUE3, VALUE3, DIRTY , DIRTY , false );
766- CheckAddCoin (PRUNED , VALUE3, VALUE3, DIRTY , DIRTY , true );
767- CheckAddCoin (PRUNED , VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH, false );
768- CheckAddCoin (PRUNED , VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH, true );
761+ CheckAddCoin (SPENT , VALUE3, VALUE3, 0 , DIRTY|FRESH, false );
762+ CheckAddCoin (SPENT , VALUE3, VALUE3, 0 , DIRTY , true );
763+ CheckAddCoin (SPENT , VALUE3, VALUE3, FRESH , DIRTY|FRESH, false );
764+ CheckAddCoin (SPENT , VALUE3, VALUE3, FRESH , DIRTY|FRESH, true );
765+ CheckAddCoin (SPENT , VALUE3, VALUE3, DIRTY , DIRTY , false );
766+ CheckAddCoin (SPENT , VALUE3, VALUE3, DIRTY , DIRTY , true );
767+ CheckAddCoin (SPENT , VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH, false );
768+ CheckAddCoin (SPENT , VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH, true );
769769 CheckAddCoin (VALUE2, VALUE3, FAIL , 0 , NO_ENTRY , false );
770770 CheckAddCoin (VALUE2, VALUE3, VALUE3, 0 , DIRTY , true );
771771 CheckAddCoin (VALUE2, VALUE3, FAIL , FRESH , NO_ENTRY , false );
@@ -805,42 +805,42 @@ BOOST_AUTO_TEST_CASE(ccoins_write)
805805 * Value Value Value Flags Flags Flags
806806 */
807807 CheckWriteCoins (ABSENT, ABSENT, ABSENT, NO_ENTRY , NO_ENTRY , NO_ENTRY );
808- CheckWriteCoins (ABSENT, PRUNED, PRUNED , NO_ENTRY , DIRTY , DIRTY );
809- CheckWriteCoins (ABSENT, PRUNED , ABSENT, NO_ENTRY , DIRTY|FRESH, NO_ENTRY );
808+ CheckWriteCoins (ABSENT, SPENT , SPENT , NO_ENTRY , DIRTY , DIRTY );
809+ CheckWriteCoins (ABSENT, SPENT , ABSENT, NO_ENTRY , DIRTY|FRESH, NO_ENTRY );
810810 CheckWriteCoins (ABSENT, VALUE2, VALUE2, NO_ENTRY , DIRTY , DIRTY );
811811 CheckWriteCoins (ABSENT, VALUE2, VALUE2, NO_ENTRY , DIRTY|FRESH, DIRTY|FRESH);
812- CheckWriteCoins (PRUNED , ABSENT, PRUNED , 0 , NO_ENTRY , 0 );
813- CheckWriteCoins (PRUNED , ABSENT, PRUNED , FRESH , NO_ENTRY , FRESH );
814- CheckWriteCoins (PRUNED , ABSENT, PRUNED , DIRTY , NO_ENTRY , DIRTY );
815- CheckWriteCoins (PRUNED , ABSENT, PRUNED , DIRTY|FRESH, NO_ENTRY , DIRTY|FRESH);
816- CheckWriteCoins (PRUNED, PRUNED, PRUNED , 0 , DIRTY , DIRTY );
817- CheckWriteCoins (PRUNED, PRUNED, PRUNED , 0 , DIRTY|FRESH, DIRTY );
818- CheckWriteCoins (PRUNED, PRUNED , ABSENT, FRESH , DIRTY , NO_ENTRY );
819- CheckWriteCoins (PRUNED, PRUNED , ABSENT, FRESH , DIRTY|FRESH, NO_ENTRY );
820- CheckWriteCoins (PRUNED, PRUNED, PRUNED , DIRTY , DIRTY , DIRTY );
821- CheckWriteCoins (PRUNED, PRUNED, PRUNED , DIRTY , DIRTY|FRESH, DIRTY );
822- CheckWriteCoins (PRUNED, PRUNED , ABSENT, DIRTY|FRESH, DIRTY , NO_ENTRY );
823- CheckWriteCoins (PRUNED, PRUNED , ABSENT, DIRTY|FRESH, DIRTY|FRESH, NO_ENTRY );
824- CheckWriteCoins (PRUNED , VALUE2, VALUE2, 0 , DIRTY , DIRTY );
825- CheckWriteCoins (PRUNED , VALUE2, VALUE2, 0 , DIRTY|FRESH, DIRTY );
826- CheckWriteCoins (PRUNED , VALUE2, VALUE2, FRESH , DIRTY , DIRTY|FRESH);
827- CheckWriteCoins (PRUNED , VALUE2, VALUE2, FRESH , DIRTY|FRESH, DIRTY|FRESH);
828- CheckWriteCoins (PRUNED , VALUE2, VALUE2, DIRTY , DIRTY , DIRTY );
829- CheckWriteCoins (PRUNED , VALUE2, VALUE2, DIRTY , DIRTY|FRESH, DIRTY );
830- CheckWriteCoins (PRUNED , VALUE2, VALUE2, DIRTY|FRESH, DIRTY , DIRTY|FRESH);
831- CheckWriteCoins (PRUNED , VALUE2, VALUE2, DIRTY|FRESH, DIRTY|FRESH, DIRTY|FRESH);
812+ CheckWriteCoins (SPENT , ABSENT, SPENT , 0 , NO_ENTRY , 0 );
813+ CheckWriteCoins (SPENT , ABSENT, SPENT , FRESH , NO_ENTRY , FRESH );
814+ CheckWriteCoins (SPENT , ABSENT, SPENT , DIRTY , NO_ENTRY , DIRTY );
815+ CheckWriteCoins (SPENT , ABSENT, SPENT , DIRTY|FRESH, NO_ENTRY , DIRTY|FRESH);
816+ CheckWriteCoins (SPENT , SPENT , SPENT , 0 , DIRTY , DIRTY );
817+ CheckWriteCoins (SPENT , SPENT , SPENT , 0 , DIRTY|FRESH, DIRTY );
818+ CheckWriteCoins (SPENT , SPENT , ABSENT, FRESH , DIRTY , NO_ENTRY );
819+ CheckWriteCoins (SPENT , SPENT , ABSENT, FRESH , DIRTY|FRESH, NO_ENTRY );
820+ CheckWriteCoins (SPENT , SPENT , SPENT , DIRTY , DIRTY , DIRTY );
821+ CheckWriteCoins (SPENT , SPENT , SPENT , DIRTY , DIRTY|FRESH, DIRTY );
822+ CheckWriteCoins (SPENT , SPENT , ABSENT, DIRTY|FRESH, DIRTY , NO_ENTRY );
823+ CheckWriteCoins (SPENT , SPENT , ABSENT, DIRTY|FRESH, DIRTY|FRESH, NO_ENTRY );
824+ CheckWriteCoins (SPENT , VALUE2, VALUE2, 0 , DIRTY , DIRTY );
825+ CheckWriteCoins (SPENT , VALUE2, VALUE2, 0 , DIRTY|FRESH, DIRTY );
826+ CheckWriteCoins (SPENT , VALUE2, VALUE2, FRESH , DIRTY , DIRTY|FRESH);
827+ CheckWriteCoins (SPENT , VALUE2, VALUE2, FRESH , DIRTY|FRESH, DIRTY|FRESH);
828+ CheckWriteCoins (SPENT , VALUE2, VALUE2, DIRTY , DIRTY , DIRTY );
829+ CheckWriteCoins (SPENT , VALUE2, VALUE2, DIRTY , DIRTY|FRESH, DIRTY );
830+ CheckWriteCoins (SPENT , VALUE2, VALUE2, DIRTY|FRESH, DIRTY , DIRTY|FRESH);
831+ CheckWriteCoins (SPENT , VALUE2, VALUE2, DIRTY|FRESH, DIRTY|FRESH, DIRTY|FRESH);
832832 CheckWriteCoins (VALUE1, ABSENT, VALUE1, 0 , NO_ENTRY , 0 );
833833 CheckWriteCoins (VALUE1, ABSENT, VALUE1, FRESH , NO_ENTRY , FRESH );
834834 CheckWriteCoins (VALUE1, ABSENT, VALUE1, DIRTY , NO_ENTRY , DIRTY );
835835 CheckWriteCoins (VALUE1, ABSENT, VALUE1, DIRTY|FRESH, NO_ENTRY , DIRTY|FRESH);
836- CheckWriteCoins (VALUE1, PRUNED, PRUNED , 0 , DIRTY , DIRTY );
837- CheckWriteCoins (VALUE1, PRUNED , FAIL , 0 , DIRTY|FRESH, NO_ENTRY );
838- CheckWriteCoins (VALUE1, PRUNED , ABSENT, FRESH , DIRTY , NO_ENTRY );
839- CheckWriteCoins (VALUE1, PRUNED , FAIL , FRESH , DIRTY|FRESH, NO_ENTRY );
840- CheckWriteCoins (VALUE1, PRUNED, PRUNED , DIRTY , DIRTY , DIRTY );
841- CheckWriteCoins (VALUE1, PRUNED , FAIL , DIRTY , DIRTY|FRESH, NO_ENTRY );
842- CheckWriteCoins (VALUE1, PRUNED , ABSENT, DIRTY|FRESH, DIRTY , NO_ENTRY );
843- CheckWriteCoins (VALUE1, PRUNED , FAIL , DIRTY|FRESH, DIRTY|FRESH, NO_ENTRY );
836+ CheckWriteCoins (VALUE1, SPENT , SPENT , 0 , DIRTY , DIRTY );
837+ CheckWriteCoins (VALUE1, SPENT , FAIL , 0 , DIRTY|FRESH, NO_ENTRY );
838+ CheckWriteCoins (VALUE1, SPENT , ABSENT, FRESH , DIRTY , NO_ENTRY );
839+ CheckWriteCoins (VALUE1, SPENT , FAIL , FRESH , DIRTY|FRESH, NO_ENTRY );
840+ CheckWriteCoins (VALUE1, SPENT , SPENT , DIRTY , DIRTY , DIRTY );
841+ CheckWriteCoins (VALUE1, SPENT , FAIL , DIRTY , DIRTY|FRESH, NO_ENTRY );
842+ CheckWriteCoins (VALUE1, SPENT , ABSENT, DIRTY|FRESH, DIRTY , NO_ENTRY );
843+ CheckWriteCoins (VALUE1, SPENT , FAIL , DIRTY|FRESH, DIRTY|FRESH, NO_ENTRY );
844844 CheckWriteCoins (VALUE1, VALUE2, VALUE2, 0 , DIRTY , DIRTY );
845845 CheckWriteCoins (VALUE1, VALUE2, FAIL , 0 , DIRTY|FRESH, NO_ENTRY );
846846 CheckWriteCoins (VALUE1, VALUE2, VALUE2, FRESH , DIRTY , DIRTY|FRESH);
@@ -854,8 +854,8 @@ BOOST_AUTO_TEST_CASE(ccoins_write)
854854 // they would be too repetitive (the parent cache is never updated in these
855855 // cases). The loop below covers these cases and makes sure the parent cache
856856 // is always left unchanged.
857- for (const CAmount parent_value : {ABSENT, PRUNED , VALUE1})
858- for (const CAmount child_value : {ABSENT, PRUNED , VALUE2})
857+ for (const CAmount parent_value : {ABSENT, SPENT , VALUE1})
858+ for (const CAmount child_value : {ABSENT, SPENT , VALUE2})
859859 for (const char parent_flags : parent_value == ABSENT ? ABSENT_FLAGS : FLAGS)
860860 for (const char child_flags : child_value == ABSENT ? ABSENT_FLAGS : CLEAN_FLAGS)
861861 CheckWriteCoins (parent_value, child_value, parent_value, parent_flags, child_flags, parent_flags);
0 commit comments