Skip to content

Commit 5a4d801

Browse files
committed
Remove temporary evaluation code.
1 parent 2af28e8 commit 5a4d801

File tree

2 files changed

+3
-44
lines changed

2 files changed

+3
-44
lines changed

src/chasers/chaser_confirm.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,7 @@ void chaser_confirm::do_bump(height_t) NOEXCEPT
217217
}
218218

219219
// Confirmation query.
220-
if ((ec = query.block_confirmable(link)) &&
221-
(ec != database::error::unconfirmed_spend))
220+
if ((ec = query.block_confirmable(link)))
222221
{
223222
if (database::error::error_category::contains(ec))
224223
{
@@ -245,12 +244,6 @@ void chaser_confirm::do_bump(height_t) NOEXCEPT
245244
LOGR("Unconfirmable block [" << height << "] " << ec.message());
246245
return;
247246
}
248-
///////////////////////////////////////////////////////////////////
249-
else if (ec == database::error::unconfirmed_spend)
250-
{
251-
LOGR("unconfirmed_spend [" << height << "].");
252-
}
253-
///////////////////////////////////////////////////////////////////
254247

255248
if (!query.set_block_confirmable(link))
256249
{

src/chasers/chaser_validate.cpp

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -272,47 +272,13 @@ code chaser_validate::validate(bool bypass, const chain::block& block,
272272
if (bypass)
273273
return ec;
274274

275-
///////////////////////////////////////////////////////////////////////////////
276-
////if (!block.is_segregated())
277-
////{
278-
//// block.clear_hash_cache(true);
279-
//// if (block.is_invalid_witness_commitment())
280-
//// return error::validate6;
281-
////}
282-
////else
283-
////{
284-
//// block.clear_hash_cache(false);
285-
//// if (block.is_invalid_merkle_root())
286-
//// return error::validate7;
287-
////}
288-
///////////////////////////////////////////////////////////////////////////////
289-
290-
///////////////////////////////////////////////////////////////////////////
291-
////if (ctx.is_enabled(chain::flags::bip141_rule) && block.is_segregated())
292-
////{
293-
//// fire(events::snapshot_span, block.segregated());
294-
////}
295-
///////////////////////////////////////////////////////////////////////////
296-
297275
auto& query = archive();
298276

299277
if ((ec = block.accept(ctx, subsidy_interval_, initial_subsidy_)))
300-
{
301-
///////////////////////////////////////////////////////////////////////
302-
// Allow failure.
303-
LOGR("block.accept [" << ctx.height << "] " << ec.message());
304-
return error::success;
305-
///////////////////////////////////////////////////////////////////////
306-
}
278+
return ec;
307279

308280
if ((ec = block.connect(ctx)))
309-
{
310-
///////////////////////////////////////////////////////////////////////
311-
// Allow failure.
312-
LOGR("block.connect [" << ctx.height << "] " << ec.message());
313-
return error::success;
314-
///////////////////////////////////////////////////////////////////////
315-
}
281+
return ec;
316282

317283
if (!query.set_prevouts(link, block))
318284
return error::validate8;

0 commit comments

Comments
 (0)