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

chore: merge master into develop #2226

Merged
merged 37 commits into from Mar 11, 2019

Conversation

Projects
None yet
5 participants
@supaiku0
Copy link
Contributor

supaiku0 commented Mar 11, 2019

Proposed changes

Merge master into develop as it has some 2.2 commits that are missing from develop.

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Refactoring (improve a current implementation without adding a new feature or fixing a bug)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Build (changes that affect the build system)
  • Docs (documentation only changes)
  • Test (adding missing tests or fixing existing tests)
  • Other... Please describe:

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)

faustbrian and others added some commits Feb 12, 2019

refactor(core-forger): Increase timeout for getting the network state (
…#2208)

* refactor(core-forger): Increase timeout for getting the network state

The 2 seconds timeout is too short and can unnecessary blow up the
forging process in cases where it is possible to forge successfully.

Set it to an arbitrary 7 seconds which is block time minus 1 second for
other activities.

Elaborate log messages by explicitly saying "Will not forge" + an
explanation "why" when the code would decide not to forge.

* Increase the timeout to only 4s to leave more time for propagation
feat(core-p2p): Don't spoil the quorum if the peer has !forgingAllowed (
#2214)

We need >66% quorum to forge and thus we should not count peers that
report "forgingAllowed: false" towards no-quorum ones, because too many
such peers could trip the forger to skip a block.

faustbrian and others added some commits Mar 11, 2019

@ArkEcosystemBot

This comment has been minimized.

Copy link
Member

ArkEcosystemBot commented Mar 11, 2019

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

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

supaiku0 and others added some commits Mar 11, 2019

@faustbrian faustbrian merged commit b0b0c10 into ArkEcosystem:develop Mar 11, 2019

6 checks passed

ci/circleci: test-node10-0 Your tests passed on CircleCI!
Details
ci/circleci: test-node10-1 Your tests passed on CircleCI!
Details
ci/circleci: test-node10-2 Your tests passed on CircleCI!
Details
ci/circleci: test-node11-0 Your tests passed on CircleCI!
Details
ci/circleci: test-node11-1 Your tests passed on CircleCI!
Details
ci/circleci: test-node11-2 Your tests passed on CircleCI!
Details
@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Mar 11, 2019

Codecov Report

Merging #2226 into develop will decrease coverage by 0.01%.
The diff coverage is 80.95%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #2226      +/-   ##
===========================================
- Coverage    74.19%   74.18%   -0.02%     
===========================================
  Files          316      317       +1     
  Lines         8265     8273       +8     
  Branches      1091     1132      +41     
===========================================
+ Hits          6132     6137       +5     
- Misses        2105     2108       +3     
  Partials        28       28
Impacted Files Coverage Δ
packages/core-p2p/src/network-state.ts 13.15% <ø> (+0.17%) ⬆️
...core-api/src/versions/1/transactions/controller.ts 80.76% <ø> (ø) ⬆️
packages/core-transaction-pool/src/connection.ts 97.89% <ø> (ø) ⬆️
packages/core-forger/src/manager.ts 72.38% <100%> (-0.77%) ⬇️
packages/core-p2p/src/peer.ts 86.11% <100%> (+0.39%) ⬆️
packages/core-blockchain/src/blockchain.ts 91.17% <100%> (+0.05%) ⬆️
packages/core-blockchain/src/state-machine.ts 96.22% <40%> (-1.86%) ⬇️
packages/core-forger/src/client.ts 78.33% <75%> (-0.98%) ⬇️
packages/core-blockchain/src/config.ts 100% <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 e731c8f...565fbd8. Read the comment docs.

@supaiku0 supaiku0 deleted the supaiku0:merge branch Mar 11, 2019

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.