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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge transactions with same hash when writing to event db #2338

Merged
merged 6 commits into from May 3, 2023

Conversation

Sriep
Copy link
Contributor

@Sriep Sriep commented Apr 27, 2023

Fixes

Merge transactions with same hash when writing to event db

Changes

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: ...

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

@codecov-commenter
Copy link

codecov-commenter commented Apr 28, 2023

Codecov Report

Merging #2338 (29c3a17) into staging (afbbb96) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

馃摚 This organization is not using Codecov鈥檚 GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff             @@
##           staging    #2338      +/-   ##
===========================================
- Coverage    28.97%   28.97%   -0.01%     
===========================================
  Files          377      377              
  Lines        63034    63034              
===========================================
- Hits         18267    18263       -4     
- Misses       42617    42626       +9     
+ Partials      2150     2145       -5     
Flag Coverage 螖
Unit-Tests 28.97% <100.00%> (-0.01%) 猬囷笍

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

Impacted Files Coverage 螖
.../0chain.net/smartcontract/dbs/event/transaction.go 4.81% <100.00%> (+2.40%) 猬嗭笍

... and 4 files with indirect coverage changes

@Sriep Sriep linked an issue Apr 28, 2023 that may be closed by this pull request
Copy link
Member

@peterlimg peterlimg 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 b61bc58 into staging May 3, 2023
6 of 8 checks passed
@dabasov dabasov deleted the merge_txs branch May 3, 2023 12:56
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.

Duplicate transactions added to transaction table
5 participants