Skip to content

Commit 9205b81

Browse files
committed
Avoid static initialization of test vectors.
1 parent 3974ed9 commit 9205b81

1 file changed

Lines changed: 33 additions & 27 deletions

File tree

test/config/block.cpp

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,15 @@ static const std::string encoded_genesis_block =
4545
"4104678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5fac"
4646
"00000000";
4747

48+
static const config::block genesis_config()
49+
{
50+
return { encoded_genesis_block };
51+
};
4852

49-
static const config::block genesis_config{ encoded_genesis_block };
50-
static const chain::block genesis_chain{ genesis_config };
53+
static const chain::block genesis_chain()
54+
{
55+
return { genesis_config() };
56+
};
5157

5258
BOOST_AUTO_TEST_CASE(block__construct__default)
5359
{
@@ -57,28 +63,28 @@ BOOST_AUTO_TEST_CASE(block__construct__default)
5763

5864
BOOST_AUTO_TEST_CASE(block__construct__copy__expected)
5965
{
60-
const block block(genesis_config);
61-
BOOST_REQUIRE_EQUAL(block, genesis_config);
66+
const block block(genesis_config());
67+
BOOST_REQUIRE_EQUAL(block, genesis_config());
6268
}
6369

6470
BOOST_AUTO_TEST_CASE(block__construct__move__expected)
6571
{
66-
auto genesis = genesis_config;
72+
auto genesis = genesis_config();
6773
const block block(std::move(genesis));
68-
BOOST_REQUIRE_EQUAL(block, genesis_config);
74+
BOOST_REQUIRE_EQUAL(block, genesis_config());
6975
}
7076

7177
BOOST_AUTO_TEST_CASE(block__construct__chain_copy__expected)
7278
{
73-
const block block(genesis_chain);
74-
BOOST_REQUIRE_EQUAL(block, genesis_config);
79+
const block block(genesis_chain());
80+
BOOST_REQUIRE_EQUAL(block, genesis_config());
7581
}
7682

7783
BOOST_AUTO_TEST_CASE(block__construct__chain_move__expected)
7884
{
79-
chain::block genesis = genesis_config;
85+
chain::block genesis = genesis_config();
8086
const block block(std::move(genesis));
81-
BOOST_REQUIRE_EQUAL(block, genesis_config);
87+
BOOST_REQUIRE_EQUAL(block, genesis_config());
8288
}
8389

8490
BOOST_AUTO_TEST_CASE(block__construct__string__expected)
@@ -90,61 +96,61 @@ BOOST_AUTO_TEST_CASE(block__construct__string__expected)
9096
BOOST_AUTO_TEST_CASE(block__assign__copy__expected)
9197
{
9298
block block{};
93-
block = genesis_config;
94-
BOOST_REQUIRE_EQUAL(block, genesis_config);
99+
block = genesis_config();
100+
BOOST_REQUIRE_EQUAL(block, genesis_config());
95101
}
96102

97103
BOOST_AUTO_TEST_CASE(block__assign__move__expected)
98104
{
99-
auto genesis = genesis_config;
105+
auto genesis = genesis_config();
100106
block block{};
101107
block = std::move(genesis);
102-
BOOST_REQUIRE_EQUAL(block, genesis_config);
108+
BOOST_REQUIRE_EQUAL(block, genesis_config());
103109
}
104110

105111
BOOST_AUTO_TEST_CASE(block__assign__chain_copy__expected)
106112
{
107113
block block{};
108-
block = genesis_chain;
109-
BOOST_REQUIRE_EQUAL(block, genesis_config);
114+
block = genesis_chain();
115+
BOOST_REQUIRE_EQUAL(block, genesis_config());
110116
}
111117

112118
BOOST_AUTO_TEST_CASE(block__assign__chain_move__expected)
113119
{
114-
auto genesis = genesis_chain;
120+
auto genesis = genesis_chain();
115121
block block{};
116122
block = std::move(genesis);
117-
BOOST_REQUIRE_EQUAL(block, genesis_config);
123+
BOOST_REQUIRE_EQUAL(block, genesis_config());
118124
}
119125

120126
BOOST_AUTO_TEST_CASE(block__equality__equal__true)
121127
{
122-
const block block{ genesis_config };
123-
BOOST_REQUIRE(block == genesis_config);
128+
const block block{ genesis_config() };
129+
BOOST_REQUIRE(block == genesis_config());
124130
}
125131

126132
BOOST_AUTO_TEST_CASE(block__equality__not_equal__false)
127133
{
128134
const block block{};
129-
BOOST_REQUIRE(!(block == genesis_config));
135+
BOOST_REQUIRE(!(block == genesis_config()));
130136
}
131137

132138
BOOST_AUTO_TEST_CASE(block__inequality__equal__false)
133139
{
134-
const block block{ genesis_config };
135-
BOOST_REQUIRE(!(block != genesis_config));
140+
const block block{ genesis_config() };
141+
BOOST_REQUIRE(!(block != genesis_config()));
136142
}
137143

138144
BOOST_AUTO_TEST_CASE(block__inequality__not_equal__true)
139145
{
140146
const block block{};
141-
BOOST_REQUIRE(block != genesis_config);
147+
BOOST_REQUIRE(block != genesis_config());
142148
}
143149

144150
BOOST_AUTO_TEST_CASE(block__equality__chain__expected)
145151
{
146152
const block block{};
147-
BOOST_REQUIRE(block != genesis_chain);
153+
BOOST_REQUIRE(block != genesis_chain());
148154
}
149155

150156
BOOST_AUTO_TEST_CASE(block__istream__populated__expected)
@@ -165,13 +171,13 @@ BOOST_AUTO_TEST_CASE(block__ostream__empty__expected)
165171
BOOST_AUTO_TEST_CASE(block__ostream__populated__expected)
166172
{
167173
std::stringstream serialized;
168-
serialized << genesis_config;
174+
serialized << genesis_config();
169175
BOOST_REQUIRE_EQUAL(serialized.str(), encoded_genesis_block);
170176
}
171177

172178
BOOST_AUTO_TEST_CASE(block__ostream__boost_lexical_cast__expected)
173179
{
174-
const auto serialized = boost::lexical_cast<std::string>(genesis_config);
180+
const auto serialized = boost::lexical_cast<std::string>(genesis_config());
175181
BOOST_REQUIRE_EQUAL(serialized, encoded_genesis_block);
176182
}
177183

0 commit comments

Comments
 (0)