Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Fix staking genesis build #14140

Merged
merged 1 commit into from
May 15, 2023
Merged

Conversation

ggwpez
Copy link
Member

@ggwpez ggwpez commented May 14, 2023

Changes:

  • Controller not needed

Fixing the Cumulus CI from paritytech/cumulus#2574 - companion checks will be red.
Cumulus companion: paritytech/cumulus#2574

Cumulus CI is stuck in paritytech/cumulus#2574, so companion check will be red.
Changes_
- Controller not needed

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
@ggwpez ggwpez requested a review from a team May 14, 2023 20:42
@ggwpez ggwpez added A0-please_review Pull request needs code review. A2-insubstantial Pull request requires no code review (e.g., a sub-repository hash update). B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit labels May 14, 2023
@ggwpez ggwpez requested a review from rossbulat May 14, 2023 20:44
@@ -631,7 +631,7 @@ pub mod pallet {
MaxNominatorsCount::<T>::put(x);
}

for &(ref stash, ref controller, balance, ref status) in &self.stakers {
for &(ref stash, _, balance, ref status) in &self.stakers {
Copy link
Member

Choose a reason for hiding this comment

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

Then we don't need controller as part of stakers?

Copy link
Member Author

@ggwpez ggwpez May 14, 2023

Choose a reason for hiding this comment

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

Yes, but that would require companions in Polkadot/Cumulus, and the CI checks are already red.
So @paritytech/staking-core could do this as follow-up.

Copy link
Member Author

Choose a reason for hiding this comment

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

Or I do it and you force-merge it 😆

Copy link
Member

Choose a reason for hiding this comment

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

We need prs in Polkadot and cumulus any was to fix ci?

Copy link
Member Author

@ggwpez ggwpez May 14, 2023

Choose a reason for hiding this comment

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

I dont hope so. The checks in paritytech/cumulus#2574 should go green once this is merged, and unless Polkadot turns red in the companion check here it should be good.

Copy link
Member Author

Choose a reason for hiding this comment

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

The tests in Cumulus fail without this change, as you can see.

Copy link
Member

Choose a reason for hiding this comment

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

@rossbulat is there any follow up on this?

Choose a reason for hiding this comment

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

I amended 'stakers' here: paritytech/polkadot#7224

Are the cumulus tests working now?

Copy link
Member

Choose a reason for hiding this comment

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

No I meant to remove controllers from the Vec entirely.

Choose a reason for hiding this comment

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

Issue has been opened.

The most important thing was to put the plug on new unique pairs initially. We now have time to tidy up the code in follow ups.

@ggwpez
Copy link
Member Author

ggwpez commented May 15, 2023

bot merge

@paritytech-processbot paritytech-processbot bot merged commit 3919ca8 into master May 15, 2023
@paritytech-processbot paritytech-processbot bot deleted the oty-fix-staking-genesis branch May 15, 2023 10:31
nathanwhit pushed a commit to nathanwhit/substrate that referenced this pull request Jul 19, 2023
Cumulus CI is stuck in paritytech/cumulus#2574, so companion check will be red.
Changes_
- Controller not needed

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-please_review Pull request needs code review. A2-insubstantial Pull request requires no code review (e.g., a sub-repository hash update). B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants