From 949405202385d5628645f6ec5878ac0bca7caf25 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 29 Jan 2019 14:39:54 +0000
Subject: [PATCH] MERGE FIX: enable parent chain in fedpeg-based unit tests

---
 src/test/test_bitcoin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 22c3c07bd9..753ed6f2a8 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -62,6 +62,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::st
     // Hack to allow testing of fedpeg args
     if (!fedpegscript.empty()) {
         gArgs.SoftSetArg("-fedpegscript", fedpegscript);
+        gArgs.SoftSetBoolArg("-con_has_parent_chain", true);
     }
     // CreateAndProcessBlock() does not support building SegWit blocks, so don't activate in these tests.
     // TODO: fix the code to support SegWit blocks.