Skip to content

Commit 3c8ae32

Browse files
evoskuilevoskuil
committed
Update relative locktime tests.
1 parent 5b55a63 commit 3c8ae32

2 files changed

Lines changed: 38 additions & 38 deletions

File tree

‎test/chain/input.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -239,88 +239,88 @@ BOOST_AUTO_TEST_CASE(input__is_final__sequence_zero__false)
239239
BOOST_REQUIRE(!instance.is_final());
240240
}
241241

242-
BOOST_AUTO_TEST_CASE(input__is_locked__enabled_block_sequence_age_equals_minimum__false)
242+
BOOST_AUTO_TEST_CASE(input__is_relative_locked__enabled_block_sequence_age_equals_minimum__false)
243243
{
244244
constexpr auto age = 7u;
245245
constexpr auto sequence_enabled_block_type_minimum = age;
246246
const input instance(point{}, {}, sequence_enabled_block_type_minimum);
247247
BOOST_REQUIRE(!instance.prevout);
248248
instance.metadata.height = 42;
249-
BOOST_REQUIRE(!instance.is_locked(instance.metadata.height + age, 0));
249+
BOOST_REQUIRE(!instance.is_relative_locked(instance.metadata.height + age, 0));
250250
}
251251

252-
BOOST_AUTO_TEST_CASE(input__is_locked__enabled_block_type_sequence_age_above_minimum__false)
252+
BOOST_AUTO_TEST_CASE(input__is_relative_locked__enabled_block_type_sequence_age_above_minimum__false)
253253
{
254254
constexpr auto age = 7u;
255255
constexpr auto sequence_enabled_block_type_minimum = sub1(age);
256256
const input instance(point{}, {}, sequence_enabled_block_type_minimum);
257257
BOOST_REQUIRE(!instance.prevout);
258258
instance.metadata.height = 42;
259-
BOOST_REQUIRE(!instance.is_locked(instance.metadata.height + age, 0));
259+
BOOST_REQUIRE(!instance.is_relative_locked(instance.metadata.height + age, 0));
260260
}
261261

262-
BOOST_AUTO_TEST_CASE(input__is_locked__enabled_block_type_sequence_age_below_minimum__true)
262+
BOOST_AUTO_TEST_CASE(input__is_relative_locked__enabled_block_type_sequence_age_below_minimum__true)
263263
{
264264
constexpr auto age = 7u;
265265
constexpr auto sequence_enabled_block_type_minimum = add1(age);
266266
const input instance(point{}, {}, sequence_enabled_block_type_minimum);
267267
BOOST_REQUIRE(!instance.prevout);
268268
instance.metadata.height = 42;
269-
BOOST_REQUIRE(instance.is_locked(instance.metadata.height + age, 0));
269+
BOOST_REQUIRE(instance.is_relative_locked(instance.metadata.height + age, 0));
270270
}
271271

272-
BOOST_AUTO_TEST_CASE(input__is_locked__disabled_block_type_sequence_age_below_minimum__false)
272+
BOOST_AUTO_TEST_CASE(input__is_relative_locked__disabled_block_type_sequence_age_below_minimum__false)
273273
{
274274
constexpr auto age = 7u;
275275
constexpr auto sequence_disabled_block_type_minimum = bit_right<uint32_t>(relative_locktime_disabled_bit) | add1(age);
276276
const input instance(point{}, {}, sequence_disabled_block_type_minimum);
277277
BOOST_REQUIRE(!instance.prevout);
278278
instance.metadata.height = 42;
279-
BOOST_REQUIRE(!instance.is_locked(instance.metadata.height + age, 0));
279+
BOOST_REQUIRE(!instance.is_relative_locked(instance.metadata.height + age, 0));
280280
}
281281

282-
BOOST_AUTO_TEST_CASE(input__is_locked__enabled_time_type_sequence_age_equals_minimum__false)
282+
BOOST_AUTO_TEST_CASE(input__is_relative_locked__enabled_time_type_sequence_age_equals_minimum__false)
283283
{
284284
constexpr auto age = 7u;
285285
constexpr auto age_seconds = 7u << relative_locktime_seconds_shift_left;
286286
constexpr auto sequence_enabled_time_type_minimum = bit_right<uint32_t>(relative_locktime_time_locked_bit) | age;
287287
const input instance(point{}, {}, sequence_enabled_time_type_minimum);
288288
BOOST_REQUIRE(!instance.prevout);
289289
instance.metadata.median_time_past = 42;
290-
BOOST_REQUIRE(!instance.is_locked(0, instance.metadata.median_time_past + age_seconds));
290+
BOOST_REQUIRE(!instance.is_relative_locked(0, instance.metadata.median_time_past + age_seconds));
291291
}
292292

293-
BOOST_AUTO_TEST_CASE(input__is_locked__enabled_time_type_sequence_age_above_minimum__false)
293+
BOOST_AUTO_TEST_CASE(input__is_relative_locked__enabled_time_type_sequence_age_above_minimum__false)
294294
{
295295
constexpr auto age = 7u;
296296
constexpr auto age_seconds = 7u << relative_locktime_seconds_shift_left;
297297
constexpr auto sequence_enabled_time_type_minimum = bit_right<uint32_t>(relative_locktime_time_locked_bit) | sub1(age);
298298
const input instance(point{}, {}, sequence_enabled_time_type_minimum);
299299
BOOST_REQUIRE(!instance.prevout);
300300
instance.metadata.median_time_past = 42;
301-
BOOST_REQUIRE(!instance.is_locked(0, instance.metadata.median_time_past + age_seconds));
301+
BOOST_REQUIRE(!instance.is_relative_locked(0, instance.metadata.median_time_past + age_seconds));
302302
}
303303

304-
BOOST_AUTO_TEST_CASE(input__is_locked__enabled_time_type_sequence_age_below_minimum__true)
304+
BOOST_AUTO_TEST_CASE(input__is_relative_locked__enabled_time_type_sequence_age_below_minimum__true)
305305
{
306306
constexpr auto age = 7u;
307307
constexpr auto age_seconds = 7u << relative_locktime_seconds_shift_left;
308308
constexpr auto sequence_enabled_time_type_minimum = bit_right<uint32_t>(relative_locktime_time_locked_bit) | add1(age);
309309
const input instance(point{}, {}, sequence_enabled_time_type_minimum);
310310
BOOST_REQUIRE(!instance.prevout);
311311
instance.metadata.median_time_past = 42;
312-
BOOST_REQUIRE(instance.is_locked(0, instance.metadata.median_time_past + age_seconds));
312+
BOOST_REQUIRE(instance.is_relative_locked(0, instance.metadata.median_time_past + age_seconds));
313313
}
314314

315-
BOOST_AUTO_TEST_CASE(input__is_locked__disabled_time_type_sequence_age_below_minimum__false)
315+
BOOST_AUTO_TEST_CASE(input__is_relative_locked__disabled_time_type_sequence_age_below_minimum__false)
316316
{
317317
constexpr auto age = 7u;
318318
constexpr auto age_seconds = 7u << relative_locktime_seconds_shift_left;
319319
constexpr auto sequence_disabled_time_type_minimum = bit_right<uint32_t>(relative_locktime_disabled_bit) | bit_right<uint32_t>(relative_locktime_time_locked_bit) | add1(age);
320320
const input instance(point{}, {}, sequence_disabled_time_type_minimum);
321321
BOOST_REQUIRE(!instance.prevout);
322322
instance.metadata.median_time_past = 42;
323-
BOOST_REQUIRE(!instance.is_locked(0, instance.metadata.median_time_past + age_seconds));
323+
BOOST_REQUIRE(!instance.is_relative_locked(0, instance.metadata.median_time_past + age_seconds));
324324
}
325325

326326
BOOST_AUTO_TEST_CASE(input__signature_operations__bips_inactive__script_sigops)

‎test/chain/transaction.cpp‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ class accessor
130130
return transaction::is_invalid_coinbase_size();
131131
}
132132

133-
bool is_non_final(size_t height, uint32_t timestamp,
133+
bool is_absolute_locked(size_t height, uint32_t timestamp,
134134
uint32_t median_time_past, bool bip113) const
135135
{
136-
return transaction::is_non_final(height, timestamp, median_time_past,
136+
return transaction::is_absolute_locked(height, timestamp, median_time_past,
137137
bip113);
138138
}
139139

@@ -152,9 +152,9 @@ class accessor
152152
return transaction::is_immature(height);
153153
}
154154

155-
bool is_locked(size_t height, uint32_t median_time_past) const
155+
bool is_relative_locked(size_t height, uint32_t median_time_past) const
156156
{
157-
return transaction::is_locked(height, median_time_past);
157+
return transaction::is_relative_locked(height, median_time_past);
158158
}
159159

160160
bool is_unconfirmed_spend(size_t height) const
@@ -1027,7 +1027,7 @@ BOOST_AUTO_TEST_CASE(transaction__is_invalid_coinbase_size__script_size_above_mi
10271027
BOOST_REQUIRE(!instance.is_invalid_coinbase_size());
10281028
}
10291029

1030-
BOOST_AUTO_TEST_CASE(transaction__is_non_final__locktime_zero__false)
1030+
BOOST_AUTO_TEST_CASE(transaction__is_absolute_locked__locktime_zero__false)
10311031
{
10321032
constexpr bool bip113 = false;
10331033
constexpr size_t height = 100;
@@ -1043,11 +1043,11 @@ BOOST_AUTO_TEST_CASE(transaction__is_non_final__locktime_zero__false)
10431043
locktime
10441044
};
10451045

1046-
BOOST_REQUIRE(!instance.is_non_final(height, time, past, bip113));
1046+
BOOST_REQUIRE(!instance.is_absolute_locked(height, time, past, bip113));
10471047
}
10481048

10491049

1050-
BOOST_AUTO_TEST_CASE(transaction__is_non_final__locktime_less_block_time_greater_threshold__false)
1050+
BOOST_AUTO_TEST_CASE(transaction__is_absolute_locked__locktime_less_block_time_greater_threshold__false)
10511051
{
10521052
constexpr bool bip113 = false;
10531053
constexpr size_t height = locktime_threshold + 100;
@@ -1063,10 +1063,10 @@ BOOST_AUTO_TEST_CASE(transaction__is_non_final__locktime_less_block_time_greater
10631063
locktime
10641064
};
10651065

1066-
BOOST_REQUIRE(!instance.is_non_final(height, time, past, bip113));
1066+
BOOST_REQUIRE(!instance.is_absolute_locked(height, time, past, bip113));
10671067
}
10681068

1069-
BOOST_AUTO_TEST_CASE(transaction__is_non_final__locktime_less_block_height_less_threshold_false)
1069+
BOOST_AUTO_TEST_CASE(transaction__is_absolute_locked__locktime_less_block_height_less_threshold_false)
10701070
{
10711071
constexpr bool bip113 = false;
10721072
constexpr size_t height = 100;
@@ -1082,10 +1082,10 @@ BOOST_AUTO_TEST_CASE(transaction__is_non_final__locktime_less_block_height_less_
10821082
locktime
10831083
};
10841084

1085-
BOOST_REQUIRE(!instance.is_non_final(height, time, past, bip113));
1085+
BOOST_REQUIRE(!instance.is_absolute_locked(height, time, past, bip113));
10861086
}
10871087

1088-
BOOST_AUTO_TEST_CASE(transaction__is_non_final__locktime_input_not_final__true)
1088+
BOOST_AUTO_TEST_CASE(transaction__is_absolute_locked__locktime_input_not_final__true)
10891089
{
10901090
constexpr bool bip113 = false;
10911091
constexpr size_t height = 100;
@@ -1102,10 +1102,10 @@ BOOST_AUTO_TEST_CASE(transaction__is_non_final__locktime_input_not_final__true)
11021102
locktime,
11031103
};
11041104

1105-
BOOST_REQUIRE(instance.is_non_final(height, time, past, bip113));
1105+
BOOST_REQUIRE(instance.is_absolute_locked(height, time, past, bip113));
11061106
}
11071107

1108-
BOOST_AUTO_TEST_CASE(transaction__is_non_final__locktime_inputs_final__false)
1108+
BOOST_AUTO_TEST_CASE(transaction__is_absolute_locked__locktime_inputs_final__false)
11091109
{
11101110
constexpr bool bip113 = false;
11111111
constexpr size_t height = 100;
@@ -1124,7 +1124,7 @@ BOOST_AUTO_TEST_CASE(transaction__is_non_final__locktime_inputs_final__false)
11241124
locktime
11251125
};
11261126

1127-
BOOST_REQUIRE(!instance.is_non_final(height, time, past, bip113));
1127+
BOOST_REQUIRE(!instance.is_absolute_locked(height, time, past, bip113));
11281128
}
11291129

11301130
BOOST_AUTO_TEST_CASE(transaction__is_missing_prevouts__empty_inputs__false)
@@ -1266,7 +1266,7 @@ BOOST_AUTO_TEST_CASE(transaction__is_immature__mature_non_coinbase__false)
12661266
BOOST_REQUIRE(!instance.is_immature(add1(coinbase_maturity)));
12671267
}
12681268

1269-
BOOST_AUTO_TEST_CASE(transaction__is_locked__version_1_empty__false)
1269+
BOOST_AUTO_TEST_CASE(transaction__is_relative_locked__version_1_empty__false)
12701270
{
12711271
constexpr uint32_t version = 1;
12721272
const accessor instance
@@ -1279,10 +1279,10 @@ BOOST_AUTO_TEST_CASE(transaction__is_locked__version_1_empty__false)
12791279
0
12801280
};
12811281

1282-
BOOST_REQUIRE(!instance.is_locked(0, 0));
1282+
BOOST_REQUIRE(!instance.is_relative_locked(0, 0));
12831283
}
12841284

1285-
BOOST_AUTO_TEST_CASE(transaction__is_locked__version_2_empty__false)
1285+
BOOST_AUTO_TEST_CASE(transaction__is_relative_locked__version_2_empty__false)
12861286
{
12871287
constexpr uint32_t version = 2;
12881288
const accessor instance
@@ -1295,10 +1295,10 @@ BOOST_AUTO_TEST_CASE(transaction__is_locked__version_2_empty__false)
12951295
0
12961296
};
12971297

1298-
BOOST_REQUIRE(!instance.is_locked(0, 0));
1298+
BOOST_REQUIRE(!instance.is_relative_locked(0, 0));
12991299
}
13001300

1301-
BOOST_AUTO_TEST_CASE(transaction__is_locked__version_1_one_of_two_locked_locked__false)
1301+
BOOST_AUTO_TEST_CASE(transaction__is_relative_locked__version_1_one_of_two_locked_locked__false)
13021302
{
13031303
constexpr uint32_t version = 1;
13041304
const accessor instance
@@ -1312,10 +1312,10 @@ BOOST_AUTO_TEST_CASE(transaction__is_locked__version_1_one_of_two_locked_locked_
13121312
0
13131313
};
13141314

1315-
BOOST_REQUIRE(!instance.is_locked(0, 0));
1315+
BOOST_REQUIRE(!instance.is_relative_locked(0, 0));
13161316
}
13171317

1318-
BOOST_AUTO_TEST_CASE(transaction__is_locked__version_4_one_of_two_locked__true)
1318+
BOOST_AUTO_TEST_CASE(transaction__is_relative_locked__version_4_one_of_two_locked__true)
13191319
{
13201320
constexpr uint32_t version = 4;
13211321
const accessor instance
@@ -1329,7 +1329,7 @@ BOOST_AUTO_TEST_CASE(transaction__is_locked__version_4_one_of_two_locked__true)
13291329
0
13301330
};
13311331

1332-
BOOST_REQUIRE(instance.is_locked(0, 0));
1332+
BOOST_REQUIRE(instance.is_relative_locked(0, 0));
13331333
}
13341334

13351335
// is_unconfirmed_spend

0 commit comments

Comments
 (0)