Page MenuHomePhabricator
Differential D5849

Backport leftovers from 15788
ClosedPublic
Actions

Authored by deadalnix on Apr 26 2020, 23:25.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rSTAGING622fa9ff28c9: Backport leftovers from 15788
rABC622fa9ff28c9: Backport leftovers from 15788
Summary

test: Have segwit always active in (Basic)TestingSetup
test: Use test_bitcoin setup in bench, Add test utils

This is a partial bakport of Core PR15788 . the original backport missed many bits.

I did not port the RPC like method because they don't build for us and they are dead code.

Depends on D5848

Test Plan
ninja all check-all

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

deadalnix created this revision.Apr 26 2020, 23:25
Herald added a reviewer: Restricted Project. · View Herald TranscriptApr 26 2020, 23:25
teamcity edited the summary of this revision. (Show Details)Apr 26 2020, 23:25

[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.

teamcity added a comment.Apr 26 2020, 23:25

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) started.

teamcity added a comment.Apr 26 2020, 23:34

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) passed.

Harbormaster completed remote builds in B10419: Diff 19140.Apr 26 2020, 23:34
Fabien requested changes to this revision.Apr 27 2020, 09:29
Fabien added a subscriber: Fabien.
Fabien added inline comments.
src/bench/duplicate_inputs.cpp
16 ↗(On Diff #19140)

Why ?

src/test/setup_common.cpp
150 ↗(On Diff #19140)

This is already done by the BasicTestingSetup constructor

src/test/util.cpp
22 ↗(On Diff #19140)

Without the rpc this can be simplified:

#include <test/util.h>

#include <chainparams.h>
#include <config.h>
#include <consensus/merkle.h>
#include <miner.h>
#include <pow.h>
#include <validation.h>
src/test/util.h
9 ↗(On Diff #19140)

Remove

This revision now requires changes to proceed.Apr 27 2020, 09:29
deadalnix updated this revision to Diff 19151.Apr 27 2020, 13:02

Address comments

Fabien accepted this revision.Apr 27 2020, 13:07
This revision is now accepted and ready to land.Apr 27 2020, 13:07
This revision was landed with ongoing or failed builds.Apr 27 2020, 13:23
Closed by commit rABC622fa9ff28c9: Backport leftovers from 15788 (authored by MarcoFalke <falke.marco@gmail.com>, committed by deadalnix). · Explain Why
This revision was automatically updated to reflect the committed changes.
deadalnix added a commit: rABC622fa9ff28c9: Backport leftovers from 15788.
teamcity added a comment.Apr 27 2020, 14:07

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) started.

teamcity added a comment.Apr 27 2020, 14:16

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) passed.

Harbormaster completed remote builds in B10423: Diff 19151.Apr 27 2020, 14:16
deadalnix added a commit: rSTAGING622fa9ff28c9: Backport leftovers from 15788.May 5 2020, 19:09

Revision Contents
Changeset List

PathSize
src/
4 lines
bench/
2 lines
36 lines
test/
24 lines
40 lines

Diff 19153

View Options

src/Makefile.bench.include

Loading...
View Options

src/bench/CMakeLists.txt

Loading...
View Options

src/bench/block_assemble.cpp

Loading...
View Options

src/test/util.h

Loading...
View Options

src/test/util.cpp

Loading...