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

cmd, epochStart, integrationTests: fix failed activation #3182

Merged
merged 3 commits into from
Jun 17, 2021

Conversation

AdoAdoAdo
Copy link
Contributor

@AdoAdoAdo AdoAdoAdo commented Jun 17, 2021

This PR activates the APR changes which failed to activate previously due to some duplicated code.
Duplicated code was removed and rewards computation uses the common handler which is aware of the changed parameters.

@codecov
Copy link

codecov bot commented Jun 17, 2021

Codecov Report

Merging #3182 (de9cafc) into master (47061cc) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3182   +/-   ##
=======================================
  Coverage   75.37%   75.37%           
=======================================
  Files         630      630           
  Lines       61791    61796    +5     
=======================================
+ Hits        46573    46578    +5     
  Misses      11064    11064           
  Partials     4154     4154           
Impacted Files Coverage Δ
epochStart/metachain/rewardsCreatorProxy.go 85.71% <100.00%> (-0.23%) ⬇️
epochStart/metachain/rewardsV2.go 91.82% <100.00%> (+0.19%) ⬆️

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 47061cc...de9cafc. Read the comment docs.

@@ -56,19 +54,15 @@ func NewRewardsCreatorV2(args RewardsCreatorArgsV2) (*rewardsCreatorV2, error) {
if check.IfNil(args.EconomicsDataProvider) {
return nil, epochStart.ErrNilEconomicsDataProvider
}
if args.TopUpGradientPoint.Cmp(zero) < 0 {
if check.IfNil(args.RewardsHandler) {
return nil, epochStart.ErrInvalidRewardsTopUpGradientPoint
Copy link
Contributor

Choose a reason for hiding this comment

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

Wrong error message

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Copy link
Contributor

@sasurobert sasurobert left a comment

Choose a reason for hiding this comment

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

Can we test by moving the activation period after staking v3.5? With one epoch at least?

@iulianpascalau iulianpascalau self-requested a review June 17, 2021 11:13
Copy link
Collaborator

@gabi-vuls gabi-vuls left a comment

Choose a reason for hiding this comment

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

System test passed.

@LucianMincu LucianMincu merged commit 5180b53 into master Jun 17, 2021
@LucianMincu LucianMincu deleted the activation-apr-changes branch June 17, 2021 15:30
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.

None yet

7 participants