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

Remove forked chain when FillBlocksAsync fail #537

Merged
merged 2 commits into from Sep 26, 2019

Conversation

earlbread
Copy link
Contributor

This removes forked chain when FillBlocksAsync fail.

@earlbread earlbread added the bug Something isn't working label Sep 26, 2019
@earlbread earlbread added this to the 0.6.0 milestone Sep 26, 2019
@earlbread earlbread self-assigned this Sep 26, 2019
@codecov
Copy link

codecov bot commented Sep 26, 2019

Codecov Report

Merging #537 into master will increase coverage by 0.19%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #537      +/-   ##
==========================================
+ Coverage   90.48%   90.67%   +0.19%     
==========================================
  Files         201      201              
  Lines       15056    15096      +40     
==========================================
+ Hits        13624    13689      +65     
+ Misses       1147     1122      -25     
  Partials      285      285
Impacted Files Coverage Δ
Libplanet/Net/Swarm.cs 83.73% <100%> (+1.53%) ⬆️
Libplanet.Tests/Net/SwarmTest.cs 98.9% <100%> (+0.02%) ⬆️
Libplanet/Net/Protocols/KademliaProtocol.cs 65.08% <0%> (+0.83%) ⬆️

CHANGES.md Outdated Show resolved Hide resolved
CHANGES.md Outdated Show resolved Hide resolved
Copy link
Member

@longfin longfin left a comment

Choose a reason for hiding this comment

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

And, It seems to need to rebase.

longfin
longfin previously approved these changes Sep 26, 2019
@longfin
Copy link
Member

longfin commented Sep 26, 2019

It seems to need to rebase. (again 😢 )

limebell
limebell previously approved these changes Sep 26, 2019
@earlbread
Copy link
Contributor Author

/rebase

@autorebase
Copy link
Contributor

autorebase bot commented Sep 26, 2019

The rebase failed:

Not Found

To rebase manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/rebase remove-chain-id
# Navigate to the new directory.
cd .worktrees/rebase
# Rebase and resolve the likely conflicts.
git rebase --interactive --autosquash master
# Push the new branch state to GitHub.
git push --force
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/rebase

@longfin
Copy link
Member

longfin commented Sep 26, 2019

/rebase

1 similar comment
@earlbread
Copy link
Contributor Author

/rebase

earlbread and others added 2 commits September 26, 2019 06:19
Co-Authored-By: Swen Mun <longfinfunnel@gmail.com>
@longfin longfin merged commit 89478a2 into planetarium:master Sep 26, 2019
@@ -121,6 +121,8 @@ To be released.
- Fixed a bug that `IActionContext.Random` had been possible to generated
equivalent results between actions of different transactions in
a `Block<T>`. [[#519]]
- Fixed a bug where a forked chain would not be deleted when an exception
occurred during fetching block from other peers. [[#527], [#535]]
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there no pull request reference? and why is there #535 reference?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My mistake. 😢 I'll fix it in another PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants