Skip to content

Reset blockCap.getTimeStamp()#1950

Merged
DorianRust merged 1 commit into
developfrom
feature/develop_event_subscribe
Jan 21, 2019
Merged

Reset blockCap.getTimeStamp()#1950
DorianRust merged 1 commit into
developfrom
feature/develop_event_subscribe

Conversation

@BlueHoopor

@BlueHoopor BlueHoopor commented Jan 21, 2019

Copy link
Copy Markdown
Contributor

What does this PR do?
change ContractLogTrigger and ContractEventTrigger 's timestamp from tx.timestamp to block.timestamp.

Why are these changes required?
Since trx.getRawData().getTimestamp() was filled by transaction creator. this item might be mis-filled.
so, use blockCapuse's timestamp for EventTrigger & LogTrigger 's timestamp.

This PR has been tested by:

  • Unit Tests
  • Manual Testing

Follow up

Extra details

@DorianRust DorianRust merged commit 236f6a7 into develop Jan 21, 2019
@codecov-io

codecov-io commented Jan 21, 2019

Copy link
Copy Markdown

Codecov Report

Merging #1950 into develop will increase coverage by 1.06%.
The diff coverage is 0%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #1950      +/-   ##
=============================================
+ Coverage      44.77%   45.84%   +1.06%     
- Complexity      4024     4563     +539     
=============================================
  Files            489      497       +8     
  Lines          28731    32151    +3420     
  Branches        3030     3771     +741     
=============================================
+ Hits           12865    14739    +1874     
- Misses         14719    16186    +1467     
- Partials        1147     1226      +79
Impacted Files Coverage Δ Complexity Δ
...main/java/org/tron/common/runtime/RuntimeImpl.java 63.56% <0%> (+0.04%) 55 <0> (+1) ⬆️
...ogsfilter/capsule/ContractEventTriggerCapsule.java 53.12% <0%> (-5.5%) 2% <0%> (ø)
...va/org/tron/common/runtime/vm/program/Program.java 44.93% <0%> (-4.12%) 136% <0%> (+14%)
...ain/java/org/tron/common/utils/ForkController.java 61.11% <0%> (-0.92%) 17% <0%> (-2%)
...ron/core/services/http/FullNodeHttpApiService.java 2.6% <0%> (-0.84%) 2% <0%> (ø)
...rc/main/java/org/tron/core/services/http/Util.java 0% <0%> (ø) 0% <0%> (ø) ⬇️
...n/java/org/tron/core/actuator/ActuatorFactory.java 0% <0%> (ø) 0% <0%> (ø) ⬇️
...in/java/org/tron/core/services/WitnessService.java 0% <0%> (ø) 0% <0%> (ø) ⬇️
src/main/java/org/tron/program/FullNode.java 0% <0%> (ø) 0% <0%> (ø) ⬇️
src/main/java/org/tron/program/SolidityNode.java 0% <0%> (ø) 0% <0%> (ø) ⬇️
... and 46 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 53a22ee...a8e5449. Read the comment docs.

@BlueHoopor

BlueHoopor commented Jan 21, 2019

Copy link
Copy Markdown
Contributor Author

confirm commit blockCap.getTimeStamp()

@shydesky shydesky deleted the feature/develop_event_subscribe branch November 13, 2019 10:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@DorianRust DorianRust DorianRust approved these changes
Reviewers whose approvals may not affect merge requirements

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

@BlueHoopor @codecov-io @DorianRust