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

Fixes #721, Unstage Transaction with same signer's lower nonce. #728

Merged
merged 1 commit into from
Dec 17, 2019

Conversation

minhoryang
Copy link
Contributor

Added the unstage logic when BlockChain.Append() called (from Non-miner's Swarm.AppendBlockAsync() and Miner's BlockChain.MineBlock())

@codecov
Copy link

codecov bot commented Dec 14, 2019

Codecov Report

Merging #728 into master will increase coverage by 0.07%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #728      +/-   ##
==========================================
+ Coverage   86.61%   86.69%   +0.07%     
==========================================
  Files         222      222              
  Lines       18753    18815      +62     
==========================================
+ Hits        16243    16311      +68     
+ Misses       1353     1347       -6     
  Partials     1157     1157
Impacted Files Coverage Δ
Libplanet.Tests/Blockchain/BlockChainTest.cs 98.69% <100%> (+0.04%) ⬆️
Libplanet/Blockchain/BlockChain.cs 91.09% <100%> (+0.17%) ⬆️
Libplanet.Tests/Net/Protocols/TestSwarm.cs 78.59% <0%> (+0.73%) ⬆️
Libplanet.Tests/Store/StoreTracker.cs 57.89% <0%> (+2.63%) ⬆️

@minhoryang minhoryang force-pushed the issues/721 branch 2 times, most recently from 835df4b to fcc94fe Compare December 14, 2019 08:34
@minhoryang
Copy link
Contributor Author

minhoryang commented Dec 14, 2019

CI Failed with following reasons:

  • Libplanet.Tests.Blockchain.BlockChainTest.AbortMining
  • Libplanet.Tests.Net.SwarmTest.PreloadSparseStateWithTrustedPeers

It doesn't seem to relate to this PR. So re-run CI please.
Libplanet.Tests.Net.SwarmTest.PreloadSparseStateWithTrustedPeers seems to relate with.
Need to diagnose this.

limebell
limebell previously approved these changes Dec 16, 2019
Copy link
Member

@limebell limebell left a comment

Choose a reason for hiding this comment

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

LGTM!

CHANGES.md Outdated Show resolved Hide resolved
@longfin longfin merged commit e1f8fe7 into planetarium:master Dec 17, 2019
@longfin
Copy link
Member

longfin commented Dec 17, 2019

Thanks for your contribution!

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.

5 participants