From 5abaca1af6870a528a16a4707d149030a9500b36 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 1 Sep 2016 13:00:02 +1200 Subject: [PATCH] Fix the failing test! --- src/wallet/wallet.h | 1 + src/zcash/IncrementalMerkleTree.hpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index b1c816fa..5b55e5c0 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -222,6 +222,7 @@ public: inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { READWRITE(address); READWRITE(nullifier); + READWRITE(witnesses); } friend bool operator<(const CNoteData& a, const CNoteData& b) { diff --git a/src/zcash/IncrementalMerkleTree.hpp b/src/zcash/IncrementalMerkleTree.hpp index 419d7484..1d023168 100644 --- a/src/zcash/IncrementalMerkleTree.hpp +++ b/src/zcash/IncrementalMerkleTree.hpp @@ -131,6 +131,9 @@ class IncrementalWitness { friend class IncrementalMerkleTree; public: + // Required for Unserialize() + IncrementalWitness() {} + MerklePath path() const { return tree.path(partial_path()); }