Paths

Table of Contentst

Differential D6253

fix wrong include prior to backporting 15639
ClosedPublic
Actions

Authored by majcosta on May 26 2020, 02:26.

Tags

None

Subscribers

None

Details

Reviewers

Group Reviewers

Restricted Project

Commits

rABCed7b9d668939: fix wrong include prior to backporting 15639

Summary

in D5967 (core commit) I've included policy/settings.h in policy/policy.h
so that our version of GetVirtualTransactionSize still had access to
::nBytesPerSigOp

recently while working on commit b874747b51882a613895a100c4210c7f1dddde30 of PR15639,
I realize, in hindsight, that looks wrong

this diff reverts the include I added to policy.h, moves our version of
GetVirtualTransactionSize to settings.h ahead of PR15639 and makes
the other necessary changes

Test Plan

ninja check-all

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

majcosta created this revision.May 26 2020, 02:26

Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 26 2020, 02:26

majcosta requested review of this revision.May 26 2020, 02:26

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

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

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

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

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

majcosta edited the summary of this revision. (Show Details)May 26 2020, 02:29

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

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

Harbormaster completed remote builds in B11023: Diff 20605.May 26 2020, 02:37

Fabien accepted this revision.May 26 2020, 08:03

This revision is now accepted and ready to land.May 26 2020, 08:03

Closed by commit rABCed7b9d668939: fix wrong include prior to backporting 15639 (authored by majcosta). · Explain WhyMay 26 2020, 11:59

This revision was automatically updated to reflect the committed changes.

majcosta added a commit: rABCed7b9d668939: fix wrong include prior to backporting 15639.

Revision Contents
Changeset List

Path

Size

src/

1 line

policy/

6 lines

7 lines

test/

mempool_tests.cpp

2 lines

wallet/

1 line

Diff 20609

src/miner.cpp

Loading...

src/policy/policy.h

Loading...

src/policy/settings.h

Loading...

src/test/mempool_tests.cpp

Loading...

src/wallet/wallet.cpp

Loading...