From 3a01200e34dccecc0a28294928b850cf1d0a4ddb Mon Sep 17 00:00:00 2001
From: Steven Roose <steven@stevenroose.org>
Date: Tue, 21 May 2019 12:23:42 +0100
Subject: [PATCH] MERGE-FIX: Fix unit tests

---
 src/Makefile.test.include  | 3 ++-
 src/test/bech32_tests.cpp  | 4 +++-
 src/test/blech32_tests.cpp | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index c4bfc3707c..00aa60eaad 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -146,11 +146,12 @@ endif
 if ENABLE_WALLET
 BITCOIN_TESTS += \
   wallet/test/db_tests.cpp \
-  wallet/test/psbt_wallet_tests.cpp \
   wallet/test/wallet_tests.cpp \
   wallet/test/wallet_crypto_tests.cpp \
   wallet/test/coinselector_tests.cpp \
   wallet/test/init_tests.cpp
+# ELEMENTS: disable PSBT test
+#  wallet/test/psbt_wallet_tests.cpp
 
 BITCOIN_TEST_SUITE += \
   wallet/test/wallet_test_fixture.cpp \
diff --git a/src/test/bech32_tests.cpp b/src/test/bech32_tests.cpp
index caad8fa593..a77ed75e70 100644
--- a/src/test/bech32_tests.cpp
+++ b/src/test/bech32_tests.cpp
@@ -69,7 +69,9 @@ BOOST_AUTO_TEST_CASE(bip173_testvectors_invalid)
 BOOST_AUTO_TEST_CASE(bech32_polymod_sanity)
 {
     std::vector<unsigned char> data(40);
-    GetRandBytes(data.data(), data.size());
+    // GetRandBytes only allows 32 bytes at a time
+    GetRandBytes(data.data(), 32);
+    GetRandBytes(data.data() + 32, data.size() - 32);
 
     std::vector<unsigned char> base32;
     ConvertBits<8, 5, true>([&](unsigned char c) { base32.push_back(c); }, data.begin(), data.end());
diff --git a/src/test/blech32_tests.cpp b/src/test/blech32_tests.cpp
index 84ab47dc1a..2c34078168 100644
--- a/src/test/blech32_tests.cpp
+++ b/src/test/blech32_tests.cpp
@@ -14,7 +14,9 @@ BOOST_FIXTURE_TEST_SUITE(blech32_tests, BasicTestingSetup)
 BOOST_AUTO_TEST_CASE(blech32_polymod_sanity)
 {
     std::vector<unsigned char> data(40);
-    GetRandBytes(data.data(), data.size());
+    // GetRandBytes only allows 32 bytes at a time
+    GetRandBytes(data.data(), 32);
+    GetRandBytes(data.data() + 32, data.size() - 32);
 
     std::vector<unsigned char> base32;
     ConvertBits<8, 5, true>([&](unsigned char c) { base32.push_back(c); }, data.begin(), data.end());