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.

Sign up for GitHub

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

Jump to bottom

merge 3.6.6 and fix conflict #2978

Merged
merged 5 commits into from
Feb 28, 2020
Merged

merge 3.6.6 and fix conflict #2978

merged 5 commits into from
Feb 28, 2020

Conversation

taihaofu
Copy link
Contributor

What does this PR do?

Why are these changes required?

This PR has been tested by:

  • Unit Tests
  • Manual Testing

Follow up

Extra details

@codecov-io
Copy link

Codecov Report

Merging #2978 into develop will decrease coverage by 0.34%.
The diff coverage is 100%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #2978      +/-   ##
=============================================
- Coverage      49.91%   49.57%   -0.35%     
+ Complexity      5695     5655      -40     
=============================================
  Files            621      621              
  Lines          35514    35514              
  Branches        3964     3964              
=============================================
- Hits           17727    17606     -121     
- Misses         16290    16425     +135     
+ Partials        1497     1483      -14
Impacted Files Coverage Δ Complexity Δ
actuator/src/main/java/org/tron/core/vm/VM.java 65.49% <ø> (ø) 115 <0> (ø) ⬇️
common/src/main/java/org/tron/core/Constant.java 66.66% <ø> (ø) 1 <0> (ø) ⬇️
...rc/main/java/org/tron/core/utils/ProposalUtil.java 46.01% <100%> (ø) 20 <0> (ø) ⬇️
...n/common/net/udp/message/discover/PongMessage.java 0% <0%> (-90%) 0% <0%> (-4%)
...org/tron/common/net/udp/handler/PacketDecoder.java 11.76% <0%> (-47.06%) 2% <0%> (-1%)
...n/common/net/udp/message/discover/PingMessage.java 63.33% <0%> (-33.34%) 1% <0%> (-5%)
.../java/org/tron/common/net/udp/message/Message.java 26.08% <0%> (-30.44%) 3% <0%> (-3%)
...udp/message/discover/DiscoverMessageInspector.java 0% <0%> (-29.73%) 0% <0%> (-7%)
...rg/tron/common/net/udp/handler/MessageHandler.java 72.41% <0%> (-27.59%) 6% <0%> (-2%)
...se/src/main/java/org/tron/core/db/CommonStore.java 37.5% <0%> (-25%) 2% <0%> (-1%)
... and 9 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 98ec8f7...dfbfce9. Read the comment docs.

CodeNinjaEvan
CodeNinjaEvan approved these changes Feb 28, 2020
View reviewed changes
Copy link
Collaborator

@CodeNinjaEvan CodeNinjaEvan left a comment

Choose a reason for hiding this comment

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

LGTM

@taihaofu taihaofu merged commit 1af2e60 into develop Feb 28, 2020
@ethan1844 ethan1844 deleted the merge_3_6_6_to_develop branch March 30, 2022 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CodeNinjaEvan CodeNinjaEvan CodeNinjaEvan approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@taihaofu @codecov-io @CodeNinjaEvan