Skip to content

Fix provide service miner overcharge deposit bug#331

Merged
leventeliu merged 5 commits intodevelopfrom
bugfix/provide_service
May 15, 2019
Merged

Fix provide service miner overcharge deposit bug#331
leventeliu merged 5 commits intodevelopfrom
bugfix/provide_service

Conversation

@xq262144
Copy link
Copy Markdown
Contributor

No description provided.

@codecov
Copy link
Copy Markdown

codecov bot commented May 15, 2019

Codecov Report

Merging #331 into develop will increase coverage by 0.02%.
The diff coverage is 64.7%.

@@             Coverage Diff             @@
##           develop     #331      +/-   ##
===========================================
+ Coverage     80.5%   80.52%   +0.02%     
===========================================
  Files          173      173              
  Lines        12278    12284       +6     
===========================================
+ Hits          9884     9892       +8     
+ Misses        1657     1648       -9     
- Partials       737      744       +7

Copy link
Copy Markdown
Contributor

@auxten auxten left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Contributor

@leventeliu leventeliu left a comment

Choose a reason for hiding this comment

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

LGTM.

@leventeliu leventeliu merged commit d564308 into develop May 15, 2019
@laodouya laodouya deleted the bugfix/provide_service branch May 15, 2019 06:42
txCount += b.txCount
for _, tx := range b.load().Transactions {
if err := c.immutable.apply(tx); err != nil {
if err := c.immutable.apply(tx, newBranch.head.height); err != nil {
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.

Maybe b.height here?

@xq262144 xq262144 restored the bugfix/provide_service branch May 15, 2019 06:45
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.

3 participants