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

fix: Ensure that we do not import multiple, conflicting tendermints #10062

Merged
merged 4 commits into from
Sep 3, 2021

Conversation

faddat
Copy link
Contributor

@faddat faddat commented Sep 2, 2021

Description

Closes: nothing

Currently, because of conflicting versions in various imports, we import multiple versions of the tendermint code base when using the cosmos SDK. This fixes it with a rather blunt instrument, the replace line. I think that this would be a very good candidate to backport to 0.42.* and 0.44.*.

Basically, it will make for cleaner builds and if I had to guess, overall safer code.


Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • reviewed "Files changed" and left comments if necessary
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed all author checklist items have been addressed
  • confirmed that this PR does not change production code

@faddat faddat changed the title Ensure that we do not import multiple, conflicting tendermints fix: Ensure that we do not import multiple, conflicting tendermints Sep 2, 2021
@faddat faddat mentioned this pull request Sep 2, 2021
19 tasks
Copy link
Member

@tac0turtle tac0turtle left a comment

Choose a reason for hiding this comment

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

does this mean we have to manually bump this in the future

@tac0turtle tac0turtle added A:automerge Automatically merge PR once all prerequisites pass. dependencies Pull requests that update a dependency file labels Sep 3, 2021
@mergify mergify bot merged commit bfba549 into cosmos:master Sep 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:automerge Automatically merge PR once all prerequisites pass. dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants