Skip to content

p2p: Remove dead service bits code#11637

Merged
laanwj merged 1 commit into
bitcoin:masterfrom
maflcko:Mf1711-p2pDead
Jul 20, 2018
Merged

p2p: Remove dead service bits code#11637
laanwj merged 1 commit into
bitcoin:masterfrom
maflcko:Mf1711-p2pDead

Conversation

@maflcko
Copy link
Copy Markdown
Member

@maflcko maflcko commented Nov 8, 2017

Seems fine to remove for the upcoming 0.17 release

Fixes #10993

@maflcko maflcko added the P2P label Nov 8, 2017
@theuni
Copy link
Copy Markdown
Member

theuni commented Nov 8, 2017

I think this is premature. Since it was shipped in 15.0, we need to consider this behavior locked-in until August. We can't practically re-use the bits until then anyway, and we still don't want to remain connected to any peer with them enabled for whatever reason.

Also, I assume the 1 << 5 is still relevant.

@maflcko maflcko added this to the Future milestone Nov 8, 2017
@maflcko maflcko changed the title Remove dead service bits code WIP: Remove dead service bits code Nov 8, 2017
@maflcko
Copy link
Copy Markdown
Member Author

maflcko commented Nov 8, 2017

Good point about keeping it in the code for now to make clear that they are taken. Guess there is no rush in merging this.

@Sjors
Copy link
Copy Markdown
Member

Sjors commented Nov 8, 2017

Isn't one needed for Bitcoin Cash nodes?

If it can be done without side-effects, it would be a nice gesture to at least deprecate it (earlier).

@maflcko
Copy link
Copy Markdown
Member Author

maflcko commented Dec 6, 2017

Needs rebase. No need to keep open; Closing for now.

@maflcko maflcko closed this Dec 6, 2017
@maflcko maflcko deleted the Mf1711-p2pDead branch December 6, 2017 01:56
@maflcko maflcko restored the Mf1711-p2pDead branch July 11, 2018 14:27
@maflcko maflcko modified the milestones: Future, 0.17.0 Jul 11, 2018
@maflcko maflcko changed the title WIP: Remove dead service bits code Remove dead service bits code Jul 11, 2018
@maflcko maflcko changed the title Remove dead service bits code p2p: Remove dead service bits code Jul 11, 2018
@maflcko maflcko reopened this Jul 11, 2018
@laanwj
Copy link
Copy Markdown
Member

laanwj commented Jul 17, 2018

utACK fa4bf92

@Sjors
Copy link
Copy Markdown
Member

Sjors commented Jul 17, 2018

Concept ACK

@theuni wrote:

consider this behavior locked-in until August

That should work with the expect v0.17 release, right?

I wrote:

Isn't one needed for Bitcoin Cash nodes?

One year seems long enough for me, especially since they've rolled out multiple hard forks that could have dealt with any potential node confusion (I haven't checked if they did).

@achow101
Copy link
Copy Markdown
Member

utACK fa4bf92

2 similar comments
@sipa
Copy link
Copy Markdown
Member

sipa commented Jul 19, 2018

utACK fa4bf92

@laanwj
Copy link
Copy Markdown
Member

laanwj commented Jul 20, 2018

utACK fa4bf92

@laanwj laanwj merged commit fa4bf92 into bitcoin:master Jul 20, 2018
laanwj added a commit that referenced this pull request Jul 20, 2018
fa4bf92 Remove dead service bits code (MarcoFalke)

Pull request description:

  Seems fine to remove for the upcoming 0.17 release

  Fixes #10993

Tree-SHA512: 3a4664b787e3da399bcaaba693619bd384826df14f469dbdfbbfffc540d9da3f2b322cda262b43388376785f77907c2540541c239ab0fca82bd7eb69d02b6b7a
@maflcko maflcko deleted the Mf1711-p2pDead branch July 20, 2018 13:48
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 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.

Return service bits 6 and 8 on Aug 1, 2018

6 participants