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(core-blockchain): remove forged transactions from pool before discarding block #2555

Merged

Conversation

Projects
None yet
4 participants
@supaiku0
Copy link
Contributor

commented May 8, 2019

Summary

When a block is discarded, because it contains already forged transactions make sure the transactions are also removed from the pool (if any).

What kind of change does this PR introduce?

  • Bugfix
  • New feature
  • Refactoring / Performance Improvements
  • Build-related changes
  • Documentation
  • Tests / Continuous Integration
  • Other, please describe:

Does this PR introduce a breaking change?

  • Yes
  • No

Does this PR release a new version?

  • Yes
    • All tests are passing
    • All benchmarks are passing without any major regressions
    • Sync from 0 works on mainnet
    • Sync from 0 works on devnet
    • Starting a new network and forging on it work
    • Explorer is fully functional
    • Wallets are fully functional
  • No

Checklist

  • I have read the CONTRIBUTING documentation
  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)
@ArkEcosystemBot

This comment has been minimized.

Copy link
Member

commented May 8, 2019

The ci/circleci: test-node11-unit job is failing as of 4876525d83894ba292dfc2db18f16ef6e0b3d36d. Please review the logs for more information.

Once you've pushed the fixes, the build will automatically re-run. Thanks!

@codecov-io

This comment has been minimized.

Copy link

commented May 9, 2019

Codecov Report

Merging #2555 into develop will increase coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #2555      +/-   ##
===========================================
+ Coverage    67.32%   67.33%   +0.01%     
===========================================
  Files          402      402              
  Lines         8811     8814       +3     
  Branches       458      418      -40     
===========================================
+ Hits          5932     5935       +3     
- Misses        2823     2825       +2     
+ Partials        56       54       -2
Impacted Files Coverage Δ
packages/core-transaction-pool/src/connection.ts 95.59% <100%> (+0.02%) ⬆️
...s/core-blockchain/src/processor/block-processor.ts 92.3% <100%> (+0.41%) ⬆️
packages/core-logger-winston/src/formatter.ts 41.66% <0%> (ø) ⬆️
...es/core-blockchain/src/replay/replay-blockchain.ts 0% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 97ea4a1...bd1267f. Read the comment docs.

@faustbrian faustbrian merged commit 20428c5 into ArkEcosystem:develop May 9, 2019

12 checks passed

ci/circleci: test-node10-benchmark Your tests passed on CircleCI!
Details
ci/circleci: test-node10-e2e Your tests passed on CircleCI!
Details
ci/circleci: test-node10-functional Your tests passed on CircleCI!
Details
ci/circleci: test-node10-integration-0 Your tests passed on CircleCI!
Details
ci/circleci: test-node10-integration-1 Your tests passed on CircleCI!
Details
ci/circleci: test-node10-unit Your tests passed on CircleCI!
Details
ci/circleci: test-node11-benchmark Your tests passed on CircleCI!
Details
ci/circleci: test-node11-e2e Your tests passed on CircleCI!
Details
ci/circleci: test-node11-functional Your tests passed on CircleCI!
Details
ci/circleci: test-node11-integration-0 Your tests passed on CircleCI!
Details
ci/circleci: test-node11-integration-1 Your tests passed on CircleCI!
Details
ci/circleci: test-node11-unit Your tests passed on CircleCI!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.