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

Check the error after Merge() and return if not nil #2551

Merged
merged 2 commits into from Jun 24, 2023

Conversation

sunilmhta
Copy link
Contributor

Fixes

#2520

Changes

Added a check for err != nil after Merge call.

Need to be mentioned in CHANGELOG.md?

Tests

Tasks to complete before merging PR:

  • Ensure system tests are passing. If not Run them manually to check for any regressions 📋
  • Do any new system tests need added to test this change? do any existing system tests need updated? If so create a PR at 0chain/system_test
  • Merge your system tests PR to master AFTER merging this PR

Associated PRs (Link as appropriate):

  • blobber:
  • gosdk:
  • system_test:
  • zboxcli:
  • zwalletcli:
  • Other: ...

@codecov-commenter
Copy link

Codecov Report

Merging #2551 (160e0bc) into staging (b74d8a3) will increase coverage by 0.01%.
The diff coverage is 0.00%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

@@             Coverage Diff             @@
##           staging    #2551      +/-   ##
===========================================
+ Coverage    28.78%   28.80%   +0.01%     
===========================================
  Files          380      380              
  Lines        63995    63996       +1     
===========================================
+ Hits         18419    18431      +12     
+ Misses       43403    43386      -17     
- Partials      2173     2179       +6     
Flag Coverage Δ
Unit-Tests 28.80% <0.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
code/go/0chain.net/sharder/transaction.go 20.12% <0.00%> (-1.36%) ⬇️

... and 3 files with indirect coverage changes

@sunilmhta sunilmhta added the bug label Jun 24, 2023
@sunilmhta sunilmhta linked an issue Jun 24, 2023 that may be closed by this pull request
@sunilmhta sunilmhta self-assigned this Jun 24, 2023
Copy link
Member

@dabasov dabasov left a comment

Choose a reason for hiding this comment

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

lgtm

@dabasov dabasov merged commit 28a5461 into staging Jun 24, 2023
6 of 8 checks passed
@dabasov dabasov deleted the users/sunilmhta/fix/2520 branch June 24, 2023 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Check error returned by the Merge() and return error if any
3 participants