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

Move EnsureOneOf into the dispatch.rs, make an interface more general #10379

Merged
merged 3 commits into from
Dec 1, 2021

Conversation

Mr-Leshiy
Copy link
Contributor

@Mr-Leshiy Mr-Leshiy commented Nov 27, 2021

polkadot companion: paritytech/polkadot#4405
skip check-dependent-cumulus

@Mr-Leshiy Mr-Leshiy force-pushed the move-or-gate branch 2 times, most recently from bc031f2 to b124b21 Compare November 27, 2021 16:34
frame/support/src/traits/dispatch.rs Show resolved Hide resolved
@bkchr bkchr requested a review from KiChjang November 27, 2021 22:04
@bkchr bkchr added 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 D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit C1-low PR touches the given topic and has a low impact on builders. labels Nov 27, 2021
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
@shawntabrizi
Copy link
Member

bot merge

@paritytech-processbot
Copy link

Error:
Error: When trying to meet the "Project Owners" approval requirements: this pull request does not belong to a project defined in Process.json.

Approval by "Project Owners" is only attempted if other means defined in the criteria for merge are not satisfied first.

The following errors might have affected the outcome of this attempt:

  • 'Batch: Availability and Validity' does not match any projects in polkadot's Process.json
  • 'Batch: Codebase Restructure' does not match any projects in polkadot's Process.json

Merge failed. Check out the criteria for merge. If you're not meeting the approval count, check if the approvers are members of substrateteamleads or core-devs.

@KiChjang
Copy link
Contributor

Well, this is a bit awkward... the cumulus companion CI check is failing, because the cumulus PR requires changes from the polkadot companion PR, but the cumulus companion CI check doesn't use the polkadot companion to compile with the cumulus companion, sooo... wat do?

@Mr-Leshiy
Copy link
Contributor Author

@shawntabrizi , @KiChjang do I need to do any update here to fix it ? Or as I understood it is related to the another repositories ?

@kianenigma
Copy link
Contributor

the cumulus companion check is a bit broken. I think you are good @Mr-Leshiy.

@kianenigma kianenigma added A1-onice and removed A2-insubstantial Pull request requires no code review (e.g., a sub-repository hash update). labels Nov 30, 2021
@bkchr
Copy link
Member

bkchr commented Dec 1, 2021

bot merge

@paritytech-processbot
Copy link

Error: It's not possible to meet the minimal approval count of 1 in paritytech/cumulus#810

@bkchr
Copy link
Member

bkchr commented Dec 1, 2021

bot merge

@paritytech-processbot
Copy link

Error: It's not possible to meet the minimal approval count of 1 in paritytech/polkadot#4405

@bkchr
Copy link
Member

bkchr commented Dec 1, 2021

bot merge

@paritytech-processbot paritytech-processbot bot merged commit 089aa25 into paritytech:master Dec 1, 2021
niklasad1 added a commit that referenced this pull request Dec 2, 2021
niklasad1 added a commit that referenced this pull request Dec 2, 2021
wischli added a commit to KILTprotocol/kilt-node that referenced this pull request Feb 1, 2022
wischli added a commit to KILTprotocol/kilt-node that referenced this pull request Feb 9, 2022
* chore: bump Polkadot dependencies to v0.9.16

* refactor: use AllPalletsWithSystem hook

* chore: remove crowdloan pallet

* fix: apply no DefaultAccount check

* fix: switch to default MaxEncodedLen

paritytech/substrate#10662

* fix: apply asset quota + runtime state_version

quota: paritytech/substrate#10382
state: paritytech/substrate#9732

* fix: Preimage registrar and Scheduler integration

Scheduler: paritytech/substrate#10356
OriginPriviligeCmp: paritytech/polkadot#4166

* fix: OrderedSet

* fix: apply new fork_id to chainspecs

paritytech/substrate#10463

* fix: apply no default account for SudoConfig

* fix: apply name changes for GrandPa

paritytech/substrate#10463

* fix: EnsureOneOf

paritytech/substrate#10379

* fix: preimage weights

* fix: parachain client

* fix: clippy copied weights

* fix: bump deps

* tests: attempt staking fix

* bench: attempt to fix default accountid for dids

* fix: staking unit test pallet order execution

* fix: did unit benchmarks

* fix: fmt

* fix: revert to old hook order execution

* bench: run manually for preimage + scheduler

* fix: only import TaskManager for try-runtime feature

* fix: use correct scheduler migration + add logs

* refactor: use explicit para runtime executors

* fix: apply code review by @Diiaablo95

* chore: apply suggestion from @weichweich review

* chore: bump deps

* fix: deps
grishasobol pushed a commit to gear-tech/substrate that referenced this pull request Mar 28, 2022
…paritytech#10379)

* move EnsureOneOf into the dispatch.rs, make an interface more general

* Update frame/support/src/traits/dispatch.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
AurevoirXavier added a commit to darwinia-network/darwinia-common that referenced this pull request Sep 8, 2022
ark0f pushed a commit to gear-tech/substrate that referenced this pull request Feb 27, 2023
…paritytech#10379)

* move EnsureOneOf into the dispatch.rs, make an interface more general

* Update frame/support/src/traits/dispatch.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
@Mr-Leshiy Mr-Leshiy deleted the move-or-gate branch July 8, 2023 08:49
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
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.

5 participants