Page MenuHomePhabricator
Differential D4898

remove segwit 'sigops cost' leftovers
ClosedPublic
Actions

Authored by markblundeberg on Jan 11 2020, 11:45.

Details

Reviewers
deadalnix
Group Reviewers
Restricted Project
Commits
rSTAGINGe4a435d58f82: remove segwit 'sigops cost' leftovers
rABCe4a435d58f82: remove segwit 'sigops cost' leftovers
Summary

In the segwit PR 8149, sigops count was quadrupled to become 'sigops cost',
Several places were still using the quadrupled value and the 'sigops cost'
name too.

https://github.com/bitcoin/bitcoin/pull/8149/commits/2b1f6f9ccf36f1e0a2c9d99154e1642f796d7c2b

Test Plan

ninja all check bench-bitcoin

Diff Detail

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

Event Timeline

markblundeberg created this revision.Jan 11 2020, 11:45
Herald added a reviewer: Restricted Project. · View Herald TranscriptJan 11 2020, 11:45
Herald added a reviewer: deadalnix. · View Herald Transcript
teamcity added a comment.Jan 11 2020, 11:45

Build Bitcoin-ABC / Diffs / Diff Testing started.

teamcity added a comment.Jan 11 2020, 11:52

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B8852: Diff 15331.Jan 11 2020, 11:52
markblundeberg planned changes to this revision.Jan 11 2020, 11:58
markblundeberg updated this revision to Diff 15332.Jan 11 2020, 12:02

also rename virtualtxsize args

teamcity added a comment.Jan 11 2020, 12:03

Build Bitcoin-ABC / Diffs / Diff Testing started.

markblundeberg added a child revision: D4896: redefine virtual transaction size to something useful.Jan 11 2020, 12:06
teamcity added a comment.Jan 11 2020, 12:09

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B8853: Diff 15332.Jan 11 2020, 12:10
deadalnix requested changes to this revision.Jan 11 2020, 13:31

Please consistently use sigOpCount instead of randomly adding it or not.

src/miner.h
194 ↗(On Diff #15332)

packageSigOpsCount

This revision now requires changes to proceed.Jan 11 2020, 13:31
markblundeberg updated this revision to Diff 15343.Jan 12 2020, 01:05

prefer name like 'sig op count'; caught a few more mentions of 'cost'

teamcity added a comment.Jan 12 2020, 01:05

Build Bitcoin-ABC / Diffs / Diff Testing started.

teamcity added a comment.Jan 12 2020, 01:12

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B8863: Diff 15343.Jan 12 2020, 01:12
markblundeberg added a child revision: D4904: [mempool_tests] add sigop counting check in TestPackageAccounting.Jan 12 2020, 03:22
deadalnix accepted this revision.Jan 12 2020, 13:58
This revision is now accepted and ready to land.Jan 12 2020, 13:58
Closed by commit rABCe4a435d58f82: remove segwit 'sigops cost' leftovers (authored by Mark Lundeberg <markblundeberg@users.noreply.github.com>). · Explain WhyJan 12 2020, 23:55
This revision was automatically updated to reflect the committed changes.
Mark Lundeberg <markblundeberg@users.noreply.github.com> added a commit: rABCe4a435d58f82: remove segwit 'sigops cost' leftovers.
markblundeberg mentioned this in D4915: scripted-diff: Remove unused first argument to addUnchecked.Jan 13 2020, 01:17
Mark Lundeberg <markblundeberg@users.noreply.github.com> added a commit: rSTAGINGe4a435d58f82: remove segwit 'sigops cost' leftovers.Apr 7 2020, 22:23

Revision Contents
Changeset List

PathSize
src/
bench/
4 lines
2 lines
consensus/
4 lines
2 lines
policy/
6 lines
10 lines
rpc/
4 lines
test/
2 lines
4 lines
8 lines
4 lines
10 lines

Diff 15366

View Options

src/bench/mempool_eviction.cpp

Loading...
View Options

src/bench/rpc_mempool.cpp

Loading...
View Options

src/consensus/tx_verify.h

Loading...
View Options

src/miner.h

Loading...
View Options

src/policy/policy.h

Loading...
View Options

src/policy/policy.cpp

Loading...
View Options

src/rpc/mining.cpp

Loading...
View Options

src/test/miner_tests.cpp

Loading...
View Options

src/test/sigopcount_tests.cpp

Loading...
View Options

src/test/test_bitcoin.h

Loading...
View Options

src/test/test_bitcoin.cpp

Loading...
View Options

src/txmempool.h

Loading...