Skip to content

Commit b7b9183

Browse files
committed
test: fix banlistmodel unit build breakages
1 parent ff0e416 commit b7b9183

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

qml/models/banlistmodel.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#define BITCOIN_QML_MODELS_BANLISTMODEL_H
77

88
#include <net_types.h>
9+
#include <netaddress.h>
910

1011
#include <QAbstractListModel>
1112
#include <QList>

test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ target_include_directories(bitcoinqml_unit_tests
3535
PRIVATE
3636
${CMAKE_CURRENT_SOURCE_DIR}/..
3737
${CMAKE_CURRENT_SOURCE_DIR}/../bitcoin/src
38+
${CMAKE_CURRENT_SOURCE_DIR}/../bitcoin/src/univalue/include
3839
)
3940

4041
target_link_libraries(bitcoinqml_unit_tests

test/test_banlistmodel.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@
66

77
#include <QSet>
88

9-
#include <qml/models/banlistmodel.h>
109
#include <test/mocks/mocknode.h>
10+
#include <qml/models/banlistmodel.h>
1111
#include <util/translation.h>
1212

13-
#include <gmock/gmock.h>
1413
#include <netbase.h>
1514

1615
#include <map>
17-
#include <optional>
1816
#include <stdexcept>
1917
#include <utility>
2018

@@ -23,11 +21,11 @@ const TranslateFn G_TRANSLATION_FUN{nullptr};
2321
namespace {
2422
CSubNet ParseSubnet(const std::string& subnet)
2523
{
26-
const std::optional<CSubNet> parsed = LookupSubNet(subnet, /*allow_lookup=*/false);
27-
if (!parsed.has_value()) {
24+
CSubNet parsed = LookupSubNet(subnet);
25+
if (!parsed.IsValid()) {
2826
throw std::runtime_error("failed to parse subnet test fixture");
2927
}
30-
return *parsed;
28+
return parsed;
3129
}
3230

3331
CBanEntry MakeBanEntry(int64_t ban_until)

0 commit comments

Comments
 (0)