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 merge in wallet service #2534

Merged
merged 1 commit into from
Dec 22, 2023
Merged

Fix merge in wallet service #2534

merged 1 commit into from
Dec 22, 2023

Conversation

StephenButtolph
Copy link
Contributor

Why this should be merged

This incorrect merge slipped through in #2532.

How this works

Removes the code as intended.

How this was tested

  • CI

@StephenButtolph StephenButtolph added bug Something isn't working cleanup Code quality improvement labels Dec 22, 2023
@StephenButtolph StephenButtolph added this to the v1.10.18 milestone Dec 22, 2023
@StephenButtolph StephenButtolph self-assigned this Dec 22, 2023
@@ -90,12 +90,6 @@ func (w *WalletService) issue(tx *txs.Tx) (ids.ID, error) {
)
return ids.Empty, err
}

w.vm.mempool.RequestBuildBlock()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

IssueVerifiedTx already notifies the mempool if applicable.

Comment on lines -96 to -98
w.vm.ctx.Log.Info("issued tx to mempool over wallet API",
zap.Stringer("txID", txID),
)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was moved into the above err == nil if conditional.

@StephenButtolph StephenButtolph mentioned this pull request Dec 22, 2023
4 tasks
@StephenButtolph StephenButtolph added this pull request to the merge queue Dec 22, 2023
Merged via the queue into dev with commit 9830e2d Dec 22, 2023
17 checks passed
@StephenButtolph StephenButtolph deleted the fix-wallet-service branch December 22, 2023 03:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working cleanup Code quality improvement
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants