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

minhoryang commented Dec 14, 2019

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

@codecov

This comment has been minimized.

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 minhoryang:issues/721 branch 2 times, most recently from 835df4b to fcc94fe Dec 14, 2019
@minhoryang

This comment has been minimized.

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.

@minhoryang minhoryang force-pushed the minhoryang:issues/721 branch from fcc94fe to c659d03 Dec 15, 2019
Copy link
Contributor

limebell left a comment

LGTM!

CHANGES.md Outdated Show resolved Hide resolved
… Append phase
@minhoryang minhoryang force-pushed the minhoryang:issues/721 branch from c659d03 to b6fe7e8 Dec 16, 2019
@limebell limebell requested review from dahlia and limebell Dec 17, 2019
@dahlia
dahlia approved these changes Dec 17, 2019
@longfin longfin merged commit e1f8fe7 into planetarium:master Dec 17, 2019
20 checks passed
20 checks passed
benchmarks (macos-latest)
Details
dist
Details
benchmarks (ubuntu-18.04)
Details
benchmarks (windows-latest)
Details
docs
Details
WIP Ready for review
Details
changelog This contains self-describing changelog.
Details
codecov/patch 100% of diff hit (target 86.61%)
Details
codecov/project 86.69% (+0.07%) compared to 29f20ad
Details
license/cla Contributor License Agreement is signed.
Details
planetarium.libplanet Build #20191216.1 succeeded
Details
planetarium.libplanet (Linux_Mono) Linux_Mono succeeded
Details
planetarium.libplanet (Linux_NETCore) Linux_NETCore succeeded
Details
planetarium.libplanet (Windows_Mono) Windows_Mono succeeded
Details
planetarium.libplanet (Windows_NETCore) Windows_NETCore succeeded
Details
planetarium.libplanet (Windows_NETCore_coverage) Windows_NETCore_coverage succeeded
Details
planetarium.libplanet (Windows_NETFramework) Windows_NETFramework succeeded
Details
planetarium.libplanet (macOS_Mono) macOS_Mono succeeded
Details
planetarium.libplanet (macOS_NETCore) macOS_NETCore succeeded
Details
planetarium.libplanet (macOS_Unity) macOS_Unity succeeded
Details
@longfin

This comment has been minimized.

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
Projects
None yet
5 participants
You can’t perform that action at this time.