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

Don't run defers if it would result in an NPE #1281

Merged
merged 3 commits into from
Jun 16, 2018
Merged

Conversation

ValarDragon
Copy link
Contributor

@ValarDragon ValarDragon commented Jun 16, 2018

Closes #1259. I've checked this on all usages of defer in the sdk.

  • Updated all relevant documentation in docs - n/a imo
  • Updated all code comments where relevant
  • Wrote tests - n/a
  • Updated CHANGELOG.md - does this need to update the changelog? I'm not sure. - updated changelog
  • Updated Gaia/Examples - n/a
  • Squashed all commits, uses message "Merge pull request #XYZ: [title]" (coding standards) - only 1 commit

@ValarDragon ValarDragon requested a review from cwgoes June 16, 2018 03:20
@ValarDragon ValarDragon requested a review from ebuchman as a code owner June 16, 2018 03:20
@ValarDragon ValarDragon force-pushed the dev/fix_defer_close branch from 0633ae2 to 61feec6 Compare June 16, 2018 03:26
@ValarDragon ValarDragon force-pushed the dev/fix_defer_close branch from 61feec6 to f1e4cfb Compare June 16, 2018 03:27

BREAKING CHANGES
* Change default ports from 466xx to 266xx

FIXES
* \#1259 - fix bug where certain tests that could have a nil pointer in defer
Copy link
Contributor

@cwgoes cwgoes Jun 16, 2018

Choose a reason for hiding this comment

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

Why the backslash? edit: escape Markdown

cwgoes
cwgoes previously approved these changes Jun 16, 2018
Copy link
Contributor

@cwgoes cwgoes left a comment

Choose a reason for hiding this comment

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

utACK

@ValarDragon
Copy link
Contributor Author

The lcd tests don't fail on my machine. My system:

?   	github.com/cosmos/cosmos-sdk/client/keys	[no test files]
ok  	github.com/cosmos/cosmos-sdk/client/lcd	65.928s
?   	github.com/cosmos/cosmos-sdk/client/rpc	[no test files]

Over here they're all basically port in use errors. (e.g. listen tcp 0.0.0.0:36658: bind: address already in use)
I think this is a circle ci issue.

@codecov
Copy link

codecov bot commented Jun 16, 2018

Codecov Report

Merging #1281 into develop will not change coverage.
The diff coverage is 100%.

@@           Coverage Diff            @@
##           develop    #1281   +/-   ##
========================================
  Coverage    65.26%   65.26%           
========================================
  Files          102      102           
  Lines         5519     5519           
========================================
  Hits          3602     3602           
  Misses        1708     1708           
  Partials       209      209

@ValarDragon
Copy link
Contributor Author

It was some strange circle ci bug earlier. Re ran the tests manually and they all passed!

@cwgoes cwgoes merged commit 1f88b0b into develop Jun 16, 2018
@cwgoes cwgoes deleted the dev/fix_defer_close branch June 16, 2018 07:50
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