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

Companion: Rename pallet trait Trait to Config #2014

Merged
8 commits merged into from
Nov 30, 2020
Merged

Conversation

gui1117
Copy link
Contributor

@gui1117 gui1117 commented Nov 25, 2020

This PR renames the pallet trait Trait to Config.

Config storage in Configuration pallet is also renamed ActiveConfig. This doesn't need a migration as Configuration pallet is not used yet. (#2036 )

companion of paritytech/substrate#7599

@gui1117 gui1117 added the A4-companion A PR that needs a companion PR to merge in parallel for one of its downstream dependencies. label Nov 25, 2020
@github-actions github-actions bot added the A0-please_review Pull request needs code review. label Nov 25, 2020
@ordian ordian added 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. labels Nov 25, 2020
/// The active configuration for the current session.
Config get(fn config) config(): HostConfiguration<T::BlockNumber>;
HostConfig get(fn config) config(): HostConfiguration<T::BlockNumber>;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

note for reviewer: this conflicted thus I changed to HostConfig

Copy link
Contributor Author

@gui1117 gui1117 Nov 30, 2020

Choose a reason for hiding this comment

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

I guess this pallet is used in some test chains, thus it needs to be migrated, I open such migration/rename in an independant PR for ease reviewing. #2036

I renamed to ActiveConfig, but as it is not used yet, I didn't do migration

@gui1117 gui1117 added A3-in_progress Pull request is in progress. No review needed at this stage. and removed A0-please_review Pull request needs code review. labels Nov 30, 2020
Copy link
Member

@ordian ordian left a comment

Choose a reason for hiding this comment

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

Looks good, assuming this compiles fine.
No need to worry about breaking rococo.

@ordian ordian added A8-mergeoncegreen and removed A3-in_progress Pull request is in progress. No review needed at this stage. labels Nov 30, 2020
@gui1117 gui1117 added A0-please_review Pull request needs code review. and removed A0-please_review Pull request needs code review. labels Nov 30, 2020
@ghost
Copy link

ghost commented Nov 30, 2020

Waiting for commit status.

@ghost
Copy link

ghost commented Nov 30, 2020

Merge failed: "Pull Request is not mergeable"

@ordian
Copy link
Member

ordian commented Nov 30, 2020

Looks like #2038 sneaked in causing a merge conflict.

@gui1117
Copy link
Contributor Author

gui1117 commented Nov 30, 2020

bot merge

@ghost
Copy link

ghost commented Nov 30, 2020

Missing process info; check that the PR belongs to a project column.

Merge can be attempted if:

  • The PR has approval from two core-devs (or one if the PR is labelled insubstantial).
  • The PR has approval from a member of substrateteamleads.
  • The PR is attached to a project column and has approval from the project owner.

See https://github.com/paritytech/parity-processbot#faq

@gui1117
Copy link
Contributor Author

gui1117 commented Nov 30, 2020

bot merge

@ghost
Copy link

ghost commented Nov 30, 2020

Waiting for commit status.

@ghost ghost merged commit efa9b99 into master Nov 30, 2020
@ghost ghost deleted the gui-rename-trait-to-config branch November 30, 2020 15:13
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A4-companion A PR that needs a companion PR to merge in parallel for one of its downstream dependencies. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants