Skip to content

Conversation

sdaftuar
Copy link
Member

Remove tests of:

  • compactblock behavior in a simulated pre-segwit version of bitcoind
    This should have been removed a long time ago, as it is not generally
    necessary for us to test the behavior of old nodes (except perhaps if we
    want to test that upgrading from an old node to a new one behaves properly)

  • compactblock behavior during segwit upgrade (ie verifying that network
    behavior before and after activation was as expected)
    This is unnecessary to test now that segwit activation has already happened.

@sdaftuar
Copy link
Member Author

This makes changes like that proposed in #15633 much easier to make (I have a relatively small diff to the test that would support that change in particular, should we want to adopt a different behavior).

@fanquake fanquake added the Tests label Mar 24, 2019
@fanquake fanquake requested a review from gmaxwell March 24, 2019 23:51
Copy link
Contributor

@jnewbery jnewbery left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 5bc755f

I've left some comments inline. One is a bug while the rest are style nits.

Whilst reviewing this, a lot of tidy-ups suggested themselves to me, so I went ahead and made a branch here: https://github.com/jnewbery/bitcoin/tree/tidy_up_p2p_compactblocks. I think the result is quite a bit clearer and easier to follow than the existing p2p_compactblocks.py. I've split out the commits in a vaguely logical way so it should be pretty easy to review. Feel free to take any or all of those changes, or we can follow this up with another PR.

@sdaftuar sdaftuar force-pushed the 2019-03-refactor-p2p-compactblocks-2 branch from 5bc755f to bbd2d9d Compare March 29, 2019 16:48
@sdaftuar
Copy link
Member Author

I've taken a bunch of the feedback and cherry-picked a few commits from @jnewbery's branch, and updated this PR. Old version is here: https://github.com/sdaftuar/bitcoin/commits/15660.1

@jnewbery
Copy link
Contributor

tested ACK f97b821. Please squash commits.

Remove tests of:
 - compactblock behavior in a simulated pre-segwit version of bitcoind
   This should have been removed a long time ago, as it is not generally
   necessary for us to test the behavior of old nodes (except perhaps if we
   want to test that upgrading from an old node to a new one behaves properly)

 - compactblock behavior during segwit upgrade (ie verifying that network
   behavior before and after activation was as expected)
   This is unnecessary to test now that segwit activation has already happened.

Includes changes by John Newbery.
@sdaftuar sdaftuar force-pushed the 2019-03-refactor-p2p-compactblocks-2 branch from f97b821 to 7813eb1 Compare April 1, 2019 21:09
@sdaftuar
Copy link
Member Author

sdaftuar commented Apr 1, 2019

Squashed.

@jnewbery
Copy link
Contributor

jnewbery commented Apr 2, 2019

utACK 7813eb1

Travis failure is unrelated. I've restarted it.

@maflcko maflcko added this to the 0.19.0 milestone Apr 2, 2019
maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request Apr 6, 2019
7813eb1 [qa] Overhaul p2p_compactblocks.py (Suhas Daftuar)

Pull request description:

  Remove tests of:
   - compactblock behavior in a simulated pre-segwit version of bitcoind
     This should have been removed a long time ago, as it is not generally
     necessary for us to test the behavior of old nodes (except perhaps if we
     want to test that upgrading from an old node to a new one behaves properly)

   - compactblock behavior during segwit upgrade (ie verifying that network
     behavior before and after activation was as expected)
     This is unnecessary to test now that segwit activation has already happened.

ACKs for commit 7813eb:
  jnewbery:
    utACK 7813eb1

Tree-SHA512: cadf035e6f822fa8cff974ed0c2e88a1d4d7da559b341e574e785fd3d309cc2c98c63bc05479265dc00550ae7b77fc3cbe815caae7f68bcff13a04367dca9b52
@maflcko maflcko merged commit 7813eb1 into bitcoin:master Apr 6, 2019
jonatack added a commit to jonatack/bitcoin-development that referenced this pull request Apr 7, 2019
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants