Page MenuHomePhabricator
Differential D2098

[qa] fix pad_tx to better match the desired size
ClosedPublic
Actions

Authored by schancel on Nov 19 2018, 07:27.

Details

Reviewers
jasonbcox
Group Reviewers
Restricted Project
Commits
rSTAGING3f1751925f6b: [qa] fix pad_tx to better match the desired size
rABC3f1751925f6b: [qa] fix pad_tx to better match the desired size
Summary

Currently, pad_tx overpads quite often. This diff makes it pad the
correct amount except in specific cases. This enables us to simplify
some other tests which need to pad blocks.

Test Plan
./test/functional/test_runner.py

Diff Detail

Repository
rABC Bitcoin ABC
Branch
fix-pad-tx (branched from master)
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 3988
Build 6048: Bitcoin ABC Buildbot (legacy)
Build 6047: arc lint + arc unit

Event Timeline

schancel created this revision.Nov 19 2018, 07:27
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 19 2018, 07:27
teamcity added a subscriber: teamcity.Nov 19 2018, 07:28

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

jasonbcox added a subscriber: jasonbcox.Nov 19 2018, 07:29
jasonbcox added inline comments.
test/functional/test_framework/txtools.py
53 ↗(On Diff #5926)

remove

55 ↗(On Diff #5926)

Rebase

schancel updated this revision to Diff 5927.Nov 19 2018, 07:29

Rebase fix comment

teamcity added a comment.Nov 19 2018, 07:31

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

jasonbcox requested changes to this revision.Nov 19 2018, 07:32
jasonbcox added inline comments.
test/functional/test_framework/txtools.py
27 ↗(On Diff #5926)

Does this deserve it's own assert before the loop? This way, we can provide a useful error message if the caller manages to build such a tx

28 ↗(On Diff #5926)

These comments should refer to pad_to_size, not MAX_TX_SIZE

This revision now requires changes to proceed.Nov 19 2018, 07:32
jasonbcox added inline comments.Nov 19 2018, 07:33
test/functional/test_framework/txtools.py
44

temp variable for required_padding - padding_len - extra_bytes

jasonbcox added inline comments.Nov 19 2018, 07:35
test/functional/test_framework/txtools.py
35

padding_len is always equal to required_padding at this line. remove this line and make the next line:
padding_len = min(required_padding, MAX_TXOUT_PUBKEY_SCRIPT - extra_bytes)

teamcity added a comment.Nov 19 2018, 07:37

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing failed.

Harbormaster failed remote builds in B3987: Diff 5926!Nov 19 2018, 07:37
teamcity added a comment.Nov 19 2018, 07:39

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing failed.

Harbormaster failed remote builds in B3988: Diff 5927!Nov 19 2018, 07:40
schancel updated this revision to Diff 5928.Nov 19 2018, 07:53

Rebase

teamcity added a comment.Nov 19 2018, 07:54

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

teamcity added a comment.Nov 19 2018, 08:03

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing failed.

Harbormaster failed remote builds in B3989: Diff 5928!Nov 19 2018, 08:03
schancel updated this revision to Diff 5931.Nov 19 2018, 08:12

Fix feedback

teamcity added a comment.Nov 19 2018, 08:12

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

jasonbcox accepted this revision.Nov 19 2018, 08:16
This revision is now accepted and ready to land.Nov 19 2018, 08:16
Closed by commit rABC3f1751925f6b: [qa] fix pad_tx to better match the desired size (authored by schancel). · Explain WhyNov 19 2018, 08:18
This revision was automatically updated to reflect the committed changes.
Harbormaster failed remote builds in B3991: Diff 5931!Nov 19 2018, 08:20
teamcity added a comment.Nov 19 2018, 08:20

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing failed.

deadalnix added a child revision: D2104: Fix block construction in abc-p2p-compactblocks.py.Nov 19 2018, 16:20

Revision Contents
Changeset List

PathSize
test/
functional/
test_framework/
61 lines

Diff 5927

View Options

test/functional/test_framework/txtools.py

Loading...