Skip to content

Commit 763d298

Browse files
committed
Fix deserialization issues in certain functional tests
1 parent a2db974 commit 763d298

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/chain.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -446,11 +446,14 @@ class CDiskBlockIndex : public CBlockIndex
446446
READWRITE(obj.hashPrev);
447447
READWRITE(obj.hashMerkleRoot);
448448
READWRITE(obj.nTime);
449+
450+
// Allocate objects in the optional<> fields when reading, since READWRITE will not do this
451+
SER_READ(obj, obj.m_dynafed_params = DynaFedParams());
452+
SER_READ(obj, obj.m_signblock_witness = CScriptWitness());
453+
SER_READ(obj, obj.proof = CProof());
454+
449455
// For compatibility with elements 0.14 based chains
450456
if (g_signed_blocks) {
451-
SER_READ(obj, obj.m_dynafed_params = DynaFedParams());
452-
SER_READ(obj, obj.m_signblock_witness = CScriptWitness());
453-
SER_READ(obj, obj.proof = CProof());
454457
if (is_dyna) {
455458
READWRITE(obj.m_dynafed_params.value());
456459
READWRITE(obj.m_signblock_witness.value().stack);

0 commit comments

Comments
 (0)