Skip to content

Commit 2a97f19

Browse files
author
MarcoFalke
committed
Merge #14771: test: Add BOOST_REQUIRE to getters returning optional
fa21ca0 test: Add BOOST_REQUIRE to getters returning optional (MarcoFalke) Pull request description: Usually the returned value is already checked for equality, but for sanity we might as well require that the getter successfully returned. Tree-SHA512: 0d613a9a721c61bd7a115ebc681a0890df09b8e5775f176ac18b3a586f2ca57bee0b5b816f5a7c314ff3ac6cbb2a4d9c434f8459e054a7c8a6934a75f0120c2a
2 parents 708cbb1 + fa21ca0 commit 2a97f19

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

src/test/coins_tests.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5+
#include <attributes.h>
56
#include <coins.h>
7+
#include <consensus/validation.h>
68
#include <script/standard.h>
9+
#include <test/test_bitcoin.h>
710
#include <uint256.h>
811
#include <undo.h>
912
#include <util/strencodings.h>
10-
#include <test/test_bitcoin.h>
1113
#include <validation.h>
12-
#include <consensus/validation.h>
1314

14-
#include <vector>
1515
#include <map>
16+
#include <vector>
1617

1718
#include <boost/test/unit_test.hpp>
1819

@@ -36,7 +37,7 @@ class CCoinsViewTest : public CCoinsView
3637
std::map<COutPoint, Coin> map_;
3738

3839
public:
39-
bool GetCoin(const COutPoint& outpoint, Coin& coin) const override
40+
NODISCARD bool GetCoin(const COutPoint& outpoint, Coin& coin) const override
4041
{
4142
std::map<COutPoint, Coin>::const_iterator it = map_.find(outpoint);
4243
if (it == map_.end()) {

src/test/dbwrapper_tests.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ BOOST_AUTO_TEST_CASE(dbwrapper_iterator)
102102
char key_res;
103103
uint256 val_res;
104104

105-
it->GetKey(key_res);
106-
it->GetValue(val_res);
105+
BOOST_REQUIRE(it->GetKey(key_res));
106+
BOOST_REQUIRE(it->GetValue(val_res));
107107
BOOST_CHECK_EQUAL(key_res, key);
108108
BOOST_CHECK_EQUAL(val_res.ToString(), in.ToString());
109109

110110
it->Next();
111111

112-
it->GetKey(key_res);
113-
it->GetValue(val_res);
112+
BOOST_REQUIRE(it->GetKey(key_res));
113+
BOOST_REQUIRE(it->GetValue(val_res));
114114
BOOST_CHECK_EQUAL(key_res, key2);
115115
BOOST_CHECK_EQUAL(val_res.ToString(), in2.ToString());
116116

src/test/util_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ struct TestArgsManager : public ArgsManager
187187
m_config_args.clear();
188188
}
189189
std::string error;
190-
ReadConfigStream(streamConfig, error);
190+
BOOST_REQUIRE(ReadConfigStream(streamConfig, error));
191191
}
192192
void SetNetworkOnlyArg(const std::string arg)
193193
{

src/util/system.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class ArgsManager
151151
std::map<OptionsCategory, std::map<std::string, Arg>> m_available_args GUARDED_BY(cs_args);
152152
std::set<std::string> m_config_sections GUARDED_BY(cs_args);
153153

154-
bool ReadConfigStream(std::istream& stream, std::string& error, bool ignore_invalid_keys = false);
154+
NODISCARD bool ReadConfigStream(std::istream& stream, std::string& error, bool ignore_invalid_keys = false);
155155

156156
public:
157157
ArgsManager();
@@ -162,7 +162,7 @@ class ArgsManager
162162
void SelectConfigNetwork(const std::string& network);
163163

164164
NODISCARD bool ParseParameters(int argc, const char* const argv[], std::string& error);
165-
bool ReadConfigFiles(std::string& error, bool ignore_invalid_keys = false);
165+
NODISCARD bool ReadConfigFiles(std::string& error, bool ignore_invalid_keys = false);
166166

167167
/**
168168
* Log warnings for options in m_section_only_args when

0 commit comments

Comments
 (0)