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

Merge branch 'develop' into 2.3 #2157

Merged
merged 24 commits into from
Feb 26, 2019
Merged

Merge branch 'develop' into 2.3 #2157

merged 24 commits into from
Feb 26, 2019

Conversation

spkjp
Copy link
Contributor

@spkjp spkjp commented Feb 25, 2019

Proposed changes

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)

vasild and others added 24 commits February 21, 2019 20:06
…2137)

Do not attempt to download blocks from peers that are on a different
chain because we know those blocks are not suitable for our chain.
* feat(core-p2p): Validate GET replies from other peers

* chore(core-p2p): Remove call to a nonexistent function

* fix(core-p2p): adjust tests to mock proper responses

* chore(core-p2p): allow "common: null" in reply for common blocks

* chore(core-p2p): Move replySchemas to a separate file
Previously we would fetch the list of peers from a single other peer and
be satisfied with it as long as our list of peers satisfies
hasMinimumPeers().

With this change we will query at least 4 peers and combine their
lists. This will help in getting a better view of the network and all of
its peers in times of splits and bad network connectivity.
* feat(core): ask for process restarts after updating

* fix(core): no need for async/await

* refactor(core): do not parse flags before they are needed

* refactor(core): remove restart warning

* fix(core): stop the spinner on error

* refactor(core): restart processes after changing channels

* fix(core): make sure the cli action is stopped on error

* fix: stop action
@spkjp spkjp requested a review from faustbrian February 25, 2019 20:44
@spkjp spkjp requested a review from kristjank as a code owner February 25, 2019 20:44
@ghost
Copy link

ghost commented Feb 25, 2019

@air1one @faustbrian - please review this in the next few days. Be sure to explicitly select labels so I know what's going on.

If no reviewer appears after a week, a reminder will be sent out.

@ghost ghost requested a review from air1one February 25, 2019 20:44
@ghost
Copy link

ghost commented Feb 25, 2019

@supaiku0 Your pull request doesn't follow our contribution guidelines. Please review and correct it.

@codecov-io
Copy link

codecov-io commented Feb 25, 2019

Codecov Report

Merging #2157 into 2.3 will increase coverage by 0.22%.
The diff coverage is 73.75%.

Impacted file tree graph

@@            Coverage Diff             @@
##              2.3    #2157      +/-   ##
==========================================
+ Coverage   76.31%   76.54%   +0.22%     
==========================================
  Files         307      309       +2     
  Lines        8348     8373      +25     
  Branches     1160     1123      -37     
==========================================
+ Hits         6371     6409      +38     
+ Misses       1944     1930      -14     
- Partials       33       34       +1
Impacted Files Coverage Δ
packages/core-p2p/src/reply-schemas.ts 100% <100%> (ø)
packages/core-blockchain/src/state-machine.ts 98.46% <100%> (+0.01%) ⬆️
packages/core-blockchain/src/state-storage.ts 100% <100%> (ø) ⬆️
...re-database/src/repositories/utils/sort-entries.ts 100% <100%> (ø)
...se/src/repositories/wallets-business-repository.ts 100% <100%> (ø) ⬆️
...kages/core-api/src/versions/2/delegates/methods.ts 74.46% <100%> (ø) ⬆️
packages/core-p2p/src/peer-verifier.ts 85.61% <100%> (-1.18%) ⬇️
packages/core-p2p/src/monitor.ts 58.49% <40%> (+6.27%) ⬆️
packages/core-blockchain/src/blockchain.ts 99.48% <50%> (-0.52%) ⬇️
.../src/repositories/delegates-business-repository.ts 67.44% <66.66%> (-0.86%) ⬇️
... and 10 more

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 6a914c2...e406317. Read the comment docs.

@faustbrian faustbrian merged commit 528dc1e into ArkEcosystem:2.3 Feb 26, 2019
@ghost ghost removed the Status: Needs Review label Feb 26, 2019
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