New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix p2p-feefilter.py for changed tx relay behavior #8444

Merged
merged 1 commit into from Aug 4, 2016

Conversation

Projects
None yet
3 participants
@sdaftuar
Member

sdaftuar commented Aug 1, 2016

This is an alternative to #8316 for fixing #7148 (comment).

The basic problem with the test that is failing is that we don't have a way to know if the next poisson relay time has occurred, if we're trying to test that nothing is inv'ed. This fix adds something that we expect to be inv'ed, and the test now assumes that anything else that would be relayed would have been relayed at the same time.

It's unfortunate that this is still somewhat dependent on how transactions are batched for announcement, but this at least improves the situation so that the test should now reliably succeed on master. And given that the implementation of feefilter is highly dependent on the transaction relay code anyway, it's not clear how much of a separation we could reasonably expect to achieve in the test.

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Aug 1, 2016

Member
Member

MarcoFalke commented Aug 1, 2016

@laanwj laanwj merged commit 2c517b3 into bitcoin:master Aug 4, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Aug 4, 2016

Merge #8444: Fix p2p-feefilter.py for changed tx relay behavior
2c517b3 Fix p2p-feefilter.py for changed tx relay behavior (Suhas Daftuar)

MarcoFalke added a commit to MarcoFalke/bitcoin that referenced this pull request Aug 4, 2016

codablock added a commit to codablock/dash that referenced this pull request Sep 19, 2017

Merge bitcoin#8444: Fix p2p-feefilter.py for changed tx relay behavior
2c517b3 Fix p2p-feefilter.py for changed tx relay behavior (Suhas Daftuar)

codablock added a commit to codablock/dash that referenced this pull request Dec 29, 2017

Merge bitcoin#8444: Fix p2p-feefilter.py for changed tx relay behavior
2c517b3 Fix p2p-feefilter.py for changed tx relay behavior (Suhas Daftuar)

codablock added a commit to codablock/dash that referenced this pull request Jan 8, 2018

Merge bitcoin#8444: Fix p2p-feefilter.py for changed tx relay behavior
2c517b3 Fix p2p-feefilter.py for changed tx relay behavior (Suhas Daftuar)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment