Skip to content

merge changes#2021

Merged
renchenchang merged 968 commits into
masterfrom
develop
Feb 28, 2019
Merged

merge changes#2021
renchenchang merged 968 commits into
masterfrom
develop

Conversation

@Yrp

@Yrp Yrp commented Feb 28, 2019

Copy link
Copy Markdown
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

xiechang33 and others added 30 commits January 16, 2019 19:03
fix: change setTransferTo_address set field
Bugfix/vm commit null value for issue 1945
# Conflicts:
#	src/main/java/org/tron/core/db/Manager.java
@codecov-io

codecov-io commented Feb 28, 2019

Copy link
Copy Markdown

Codecov Report

Merging #2021 into master will decrease coverage by 1.19%.
The diff coverage is 35.69%.

Impacted file tree graph

@@             Coverage Diff             @@
##             master    #2021     +/-   ##
===========================================
- Coverage      45.7%   44.51%   -1.2%     
- Complexity     3820     4038    +218     
===========================================
  Files           463      494     +31     
  Lines         26867    29041   +2174     
  Branches       2714     3022    +308     
===========================================
+ Hits          12280    12928    +648     
- Misses        13531    14960   +1429     
- Partials       1056     1153     +97
Impacted Files Coverage Δ Complexity Δ
...mmon/net/udp/message/discover/FindNodeMessage.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...c/main/java/org/tron/core/config/CommonConfig.java 100% <ø> (ø) 1 <0> (-1) ⬇️
.../java/org/tron/core/db2/core/AbstractSnapshot.java 100% <ø> (ø) 8 <0> (ø) ⬇️
...n/common/net/udp/message/discover/PongMessage.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...mon/net/udp/message/discover/NeighborsMessage.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...n/common/net/udp/message/discover/PingMessage.java 65.51% <ø> (-1.15%) 1 <0> (-1)
src/main/java/org/tron/program/Version.java 50% <ø> (ø) 1 <0> (ø) ⬇️
...rc/main/java/org/tron/core/db2/common/LevelDB.java 91.66% <ø> (ø) 11 <0> (ø) ⬇️
...re/actuator/UpdateEnergyLimitContractActuator.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...in/java/org/tron/common/utils/RandomGenerator.java 0% <0%> (ø) 0 <0> (ø) ⬇️
... and 315 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 7644726...3f56de7. Read the comment docs.

@renchenchang renchenchang merged commit cb0c5a3 into master Feb 28, 2019

@HaoqiZhao HaoqiZhao left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

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.