Skip to content
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

p2p/discv5: fix test on go 1.14 #20724

Merged
merged 1 commit into from
Feb 27, 2020
Merged

Conversation

fjl
Copy link
Contributor

@fjl fjl commented Feb 27, 2020

No description provided.

@fjl fjl requested a review from zsfelfoldi as a code owner February 27, 2020 10:52
@karalabe
Copy link
Member

Does this only fail on Go 1.14? If you change the error for all Go releases, why does travis pass on 1.11, 1.12 and 1.13?

@fjl
Copy link
Contributor Author

fjl commented Feb 27, 2020

This fails on go 1.14 because they tweaked the error message in the URL parser again to quote the input. On previous go releases, the error was parse <input>: ..., now it's parse "<input>": .... We already changed the test to use strings.Contains last time this happened, this change just cuts the prefix so we don't check for it anymore.

@karalabe
Copy link
Member

We already changed the test to use strings.Contains last time this happened

Ah, that's the magic.

Copy link
Member

@karalabe karalabe left a comment

Choose a reason for hiding this comment

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

LGTM

@karalabe karalabe added this to the 1.9.12 milestone Feb 27, 2020
@karalabe karalabe merged commit 1e1b186 into ethereum:master Feb 27, 2020
pull bot pushed a commit to scope-demo/go-ethereum that referenced this pull request Feb 27, 2020
tonyredondo pushed a commit to scope-demo/go-ethereum that referenced this pull request Feb 27, 2020
* internal/ethapi: default to zero address for calls (ethereum#20702)

This makes eth_call and eth_estimateGas use the zero address
as sender when the "from" parameter is not supplied.

Co-authored-by: Felix Lange <[email protected]>

* les: separate peer into clientPeer and serverPeer (ethereum#19991)

* les: separate peer into clientPeer and serverPeer

* les: address comments

* mobile: add CallOpts.SetFrom (ethereum#20721)

This was missing because I forgot to wrap it when bind.CallOpts.From
as added.

* crypto/bn256: fix import line (ethereum#20723)

* p2p/discv5: fix test on go 1.14 (ethereum#20724)

Co-authored-by: Martin Holst Swende <[email protected]>
Co-authored-by: Felix Lange <[email protected]>
Co-authored-by: gary rong <[email protected]>
Co-authored-by: Adam Schmideg <[email protected]>
kjx98 pushed a commit to kjx98/go-ethereum that referenced this pull request Mar 17, 2020
enriquefynn pushed a commit to enriquefynn/go-ethereum that referenced this pull request Mar 10, 2021
tony-ricciardi pushed a commit to tony-ricciardi/go-ethereum that referenced this pull request Jan 20, 2022
)

* go.mod: update golang.org/x/crypto to fix a Go 1.14 race rejection

Cherry-pick conflicts:
  go.mod
  go.sum

* p2p/discv5: fix test on go 1.14 (ethereum#20724)

Cherry-picked to celo-blockchain

* travis, appveyor, build, Dockerfile: bump Go to 1.14.2 (ethereum#20913)

* travis, appveyor, build, Dockerfile: bump Go to 1.14.2

* travis, appveyor: force GO111MODULE=on for every build

Cherry-pick conflicts:
  .travis.yml
  appveyor.yml
  build/checksums.txt

* Update CircleCI and dockerfiles to use Go 1.14

* Revert ios build CI config to work with Go 1.13

* Update golang download links to 1.14.12

Co-authored-by: Péter Szilágyi <[email protected]>
Co-authored-by: Felix Lange <[email protected]>

Co-authored-by: Péter Szilágyi <[email protected]>
Co-authored-by: Felix Lange <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants