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: Prevent newExporter crash if tree.ndb is nil (backport #622) #631

Merged
merged 2 commits into from
Dec 8, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 25, 2022

This is an automatic backport of pull request #622 done by Mergify.
Cherry-pick of 2777659 has failed:

On branch mergify/bp/release/v0.19.x/pr-622
Your branch is up to date with 'origin/release/v0.19.x'.

You are currently cherry-picking commit 2777659.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.md
	modified:   Makefile
	modified:   benchmarks/cosmos-exim/main.go
	modified:   export_test.go
	modified:   immutable_tree.go
	modified:   import_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   export.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Co-authored-by: Marko <marbar3778@yahoo.com>
(cherry picked from commit 2777659)

# Conflicts:
#	export.go
@mergify mergify bot requested a review from a team as a code owner November 25, 2022 15:05
@mergify mergify bot added the conflicts label Nov 25, 2022
@tac0turtle tac0turtle merged commit 2af006a into release/v0.19.x Dec 8, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.19.x/pr-622 branch December 8, 2022 10:24
@@ -35,7 +38,15 @@ type Exporter struct {
}

// NewExporter creates a new Exporter. Callers must call Close() when done.
func newExporter(tree *ImmutableTree) *Exporter {
func newExporter(tree *ImmutableTree) (*Exporter, error) {
Copy link
Member

Choose a reason for hiding this comment

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

ah dam, actually we should have not broken api here

tac0turtle added a commit that referenced this pull request Dec 8, 2022
yihuang added a commit to yihuang/iavl that referenced this pull request Jan 11, 2023
yihuang added a commit to yihuang/iavl that referenced this pull request Jan 26, 2023
ankurdotb pushed a commit to cheqd/iavl that referenced this pull request Feb 28, 2023
… (cosmos#631)

Co-authored-by: Chill Validation <92176880+chillyvee@users.noreply.github.com>
Co-authored-by: Marko Baricevic <marbar3778@yahoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants