Add ivk member variable and equality comparators to SaplingNoteData class.
This commit is contained in:
parent
3438e26cc3
commit
a132719da5
|
@ -267,13 +267,23 @@ class SaplingNoteData
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* We initialize the hight to -1 for the same reason as we do in SproutNoteData.
|
* We initialize the height to -1 for the same reason as we do in SproutNoteData.
|
||||||
* See the comment in that class for a full description.
|
* See the comment in that class for a full description.
|
||||||
*/
|
*/
|
||||||
SaplingNoteData() : witnessHeight {-1} { }
|
SaplingNoteData() : witnessHeight {-1} { }
|
||||||
|
SaplingNoteData(libzcash::SaplingIncomingViewingKey ivk) : ivk {ivk}, witnessHeight {-1} { }
|
||||||
|
|
||||||
std::list<SaplingWitness> witnesses;
|
std::list<SaplingWitness> witnesses;
|
||||||
int witnessHeight;
|
int witnessHeight;
|
||||||
|
libzcash::SaplingIncomingViewingKey ivk;
|
||||||
|
|
||||||
|
friend bool operator==(const SaplingNoteData& a, const SaplingNoteData& b) {
|
||||||
|
return (a.ivk == b.ivk && a.nullifier == b.nullifier && a.witnessHeight == b.witnessHeight);
|
||||||
|
}
|
||||||
|
|
||||||
|
friend bool operator!=(const SaplingNoteData& a, const SaplingNoteData& b) {
|
||||||
|
return !(a == b);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef std::map<JSOutPoint, SproutNoteData> mapSproutNoteData_t;
|
typedef std::map<JSOutPoint, SproutNoteData> mapSproutNoteData_t;
|
||||||
|
|
Loading…
Reference in New Issue