Fix for Issue 4762 #4803
Fix for Issue 4762 #4803
Conversation
|
User @gotnoshoeson, please sign the CLA here. |
|
Review required! Latest push from author must always be reviewed |
| // throw defensive message when service_queues is called from on_initialize | ||
| // don't throw message when service_queues is called from on_idle |
There was a problem hiding this comment.
I'd add the reason here, that it doesn't matter if on_idle doesn't have enough weight
There was a problem hiding this comment.
Okay, that makes sense. Thank you
|
Please give it a descriptive title in case that it appears in the CHANGELOG. |
|
@gotnoshoeson what @ggwpez meant above is that, could you please add a prdoc file? |
|
The CI pipeline was cancelled due to failure one of the required jobs. |
| @@ -1554,12 +1564,17 @@ impl<T: Get<O>, O: Into<u32>> Get<u32> for IntoU32<T, O> { | |||
| impl<T: Config> ServiceQueues for Pallet<T> { | |||
| type OverweightMessageAddress = (MessageOriginOf<T>, PageIndex, T::Size); | |||
|
|
|||
| fn service_queues(weight_limit: Weight) -> Weight { | |||
| fn service_queues(weight_limit: Weight, context: ServiceQueuesContext) -> Weight { | |||
There was a problem hiding this comment.
I just noticed that this is implementing a trait function. Can you maybe put the inner logic into a new function and call that from here?
Having the ServiceQueuesContext in the interface would be ugly otherwise.
There was a problem hiding this comment.
Thanks, I pushed a new commit last night (PST). Now that I'm re-reading this I might not have implemented the way you requested.
There was a problem hiding this comment.
I mean, the code does not compile? You are implementing a trait function. Please try to run the pallet tests locally.
|
Hi. Sorry I fell off this issue. But I'm back to finish if it's still open. Can you provide guidance of what is needed to complete? Thx |
bkchr
added
the
A4-needs-backport
504edb1
|
Successfully created backport PR for |
[Issue #4762 ](#4762) - Creates an enum for passing context of `service_queues` being called from within `on_initialize` and `on_idle` hooks. Uses a match statement inside of `service_queues` to continue using the same code, but NOT throw a `defensive` if being called within `on_idle` hook. - The issue requested to not throw the `defensive` if being called from within `on_idle` hook. - Created the `ServiceQueuesContext` enum to pass as an argument of `service_queues` when called within the `on_initialize` and `on_idle` hooks. A match statement was added inside of `service_queues` to continue to throw the defensive if called from `on_initialize` but NOT throw the defensive if called from `on_idle`. --------- Co-authored-by: gotnoshoeson <milesbrentpatterson@proton.me> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: Bastian Köcher <info@kchr.de> (cherry picked from commit 504edb1)
|
Successfully created backport PR for |
[Issue #4762 ](#4762) - Creates an enum for passing context of `service_queues` being called from within `on_initialize` and `on_idle` hooks. Uses a match statement inside of `service_queues` to continue using the same code, but NOT throw a `defensive` if being called within `on_idle` hook. - The issue requested to not throw the `defensive` if being called from within `on_idle` hook. - Created the `ServiceQueuesContext` enum to pass as an argument of `service_queues` when called within the `on_initialize` and `on_idle` hooks. A match statement was added inside of `service_queues` to continue to throw the defensive if called from `on_initialize` but NOT throw the defensive if called from `on_idle`. --------- Co-authored-by: gotnoshoeson <milesbrentpatterson@proton.me> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: Bastian Köcher <info@kchr.de> (cherry picked from commit 504edb1)
Backport #4803 into `stable2407` from gotnoshoeson. See the [documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md) on how to use this bot. <!-- # To be used by other automation, do not modify: original-pr-number: #${pull_number} --> Co-authored-by: Miles Patterson <miles_patterson@icloud.com>
Backport #4803 into `stable2409` from gotnoshoeson. See the [documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md) on how to use this bot. <!-- # To be used by other automation, do not modify: original-pr-number: #${pull_number} --> Co-authored-by: Miles Patterson <miles_patterson@icloud.com>
Backport #4803 into `stable2407` from gotnoshoeson. See the [documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md) on how to use this bot. <!-- # To be used by other automation, do not modify: original-pr-number: #${pull_number} --> Co-authored-by: Miles Patterson <miles_patterson@icloud.com>
Issue #4762
service_queuesbeing called from withinon_initializeandon_idlehooks. Uses a match statement inside ofservice_queuesto continue using the same code, but NOT throw adefensiveif being called withinon_idlehook.defensiveif being called from withinon_idlehook.ServiceQueuesContextenum to pass as an argument ofservice_queueswhen called within theon_initializeandon_idlehooks. A match statement was added inside ofservice_queuesto continue to throw the defensive if called fromon_initializebut NOT throw the defensive if called fromon_idle.