Adds force_origin support #13845

gupnik · 2023-04-06T13:31:02Z

In benchmarking v1, we used to be able to do:

let force_origin =
	T::ForceEnterOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;

_<T::RuntimeOrigin>(force_origin)

With this change, the syntax in v2 would look like:

let force_origin =
	T::ForceEnterOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
#[extrinsic_call]
_(force_origin as T::RuntimeOrigin);

gupnik · 2023-04-06T13:31:18Z

Will add an example soon

gupnik · 2023-04-06T13:37:37Z

frame/lottery/src/benchmarking.rs

 	}

-	start_lottery {
+/* 


Will move rest of them soon

sam0x17 · 2023-04-06T13:39:14Z

This looks good to me as long as it works with the existing examples. Love the simple as syntax.

Also in this PR we will want to add passing and failing UI tests (maybe choose a non-cast expr type that is also invalid with the existing syntax as one of the failing examples), and we will want the docs for benchmark v2 updated so people know about this syntax :)

frame/lottery/src/benchmarking.rs

gupnik · 2023-04-07T16:43:04Z

bot fmt

command-bot · 2023-04-07T16:43:09Z

@gupnik https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2656974 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/fmt/fmt.sh". Check out https://gitlab.parity.io/parity/mirrors/substrate/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 2-fdef3bb0-fd2d-4154-8421-91bcdcceee08 to cancel this command or bot cancel to cancel all commands in this pull request.

command-bot · 2023-04-07T16:44:25Z

@gupnik Command "$PIPELINE_SCRIPTS_DIR/commands/fmt/fmt.sh" has finished. Result: https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2656974 has finished. If any artifacts were generated, you can download them from https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2656974/artifacts/download.

…force_origin

sam0x17

This looks good to me once everything is passing, good end-to-end example with the lottery pallet, and the negative UI test looks good

sam0x17 · 2023-04-22T05:11:46Z

frame/benchmarking/src/lib.rs

@@ -160,6 +160,12 @@ pub use v1::*;
 /// The underscore will be substituted with the name of the benchmark  (i.e. the name of the
 /// function in the benchmark function definition).
 ///
+/// In case of a `force_origin`, this is the general syntax:


perhaps a sentence or two explaining what force_origin means or a link to elsewhere in the docs where this is explained

Updated. Please let me know if this works.

ggwpez · 2023-04-22T12:39:45Z

Did you look at the CI output? Something with the Linear syntax does not seem to work together with config vars.

error[E0433]: failed to resolve: use of undeclared type `T`
     --> /builds/parity/mirrors/substrate/frame/lottery/src/benchmarking.rs:92:30
      |
   92 |     fn set_calls(n: Linear<0, { T::MaxCalls::get() }>) -> Result<(), BenchmarkError> {
      |                                 ^ use of undeclared type `T`

sam0x17 · 2023-04-22T12:40:40Z

Did you look at the CI output? Something with the Linear syntax does not seem to work together with config vars.

error[E0433]: failed to resolve: use of undeclared type `T`
     --> /builds/parity/mirrors/substrate/frame/lottery/src/benchmarking.rs:92:30
      |
   92 |     fn set_calls(n: Linear<0, { T::MaxCalls::get() }>) -> Result<(), BenchmarkError> {
      |                                 ^ use of undeclared type `T`

yeah I'm going back and forth helping him debug it and removed my review haha

gupnik · 2023-04-22T12:41:43Z

Did you look at the CI output? Something with the Linear syntax does not seem to work together with config vars.

error[E0433]: failed to resolve: use of undeclared type `T`
     --> /builds/parity/mirrors/substrate/frame/lottery/src/benchmarking.rs:92:30
      |
   92 |     fn set_calls(n: Linear<0, { T::MaxCalls::get() }>) -> Result<(), BenchmarkError> {
      |                                 ^ use of undeclared type `T`

Yes, looking into this

…force_origin

gupnik · 2023-04-22T16:05:58Z

bot fmt

command-bot · 2023-04-22T16:06:03Z

@gupnik https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2717436 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/fmt/fmt.sh". Check out https://gitlab.parity.io/parity/mirrors/substrate/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 50-2fa1f27e-16e9-4b8d-9cdb-63d00c52ad5c to cancel this command or bot cancel to cancel all commands in this pull request.

command-bot · 2023-04-22T16:07:17Z

@gupnik Command "$PIPELINE_SCRIPTS_DIR/commands/fmt/fmt.sh" has finished. Result: https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2717436 has finished. If any artifacts were generated, you can download them from https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2717436/artifacts/download.

ggwpez

thanks looks good!
Could you still please extend the description a bit to show how the V1 syntax of this looked like?
I will try to migrate another pallet to see that it works there as well.

* Adds force_origin support * Moves a couple of tests to showcase v2 with force_origin * Adds remaining tests * adds documentation * minor * adds test for invalid origin * ".git/.scripts/commands/fmt/fmt.sh" * updates param to use MaxCalls * Fixes compilation error * Updates doc comment * Fixes test outputs * Fixes test output * ".git/.scripts/commands/fmt/fmt.sh" --------- Co-authored-by: command-bot <>

Adds force_origin support

37a3401

gupnik requested a review from sam0x17 April 6, 2023 13:31

gupnik requested review from kianenigma and ggwpez April 6, 2023 13:32

Moves a couple of tests to showcase v2 with force_origin

42a4ee1

gupnik commented Apr 6, 2023

View reviewed changes

frame/lottery/src/benchmarking.rs Outdated

}

start_lottery {

/*

Copy link

Contributor Author

gupnik Apr 6, 2023

Choose a reason for hiding this comment

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

Will move rest of them soon

Adds remaining tests

b3dad21

gupnik commented Apr 7, 2023

View reviewed changes

frame/lottery/src/benchmarking.rs Outdated Show resolved Hide resolved

codekitz added 2 commits April 7, 2023 21:36

adds documentation

b0b42a5

minor

eb5b6b5

gupnik marked this pull request as ready for review April 7, 2023 16:09

adds test for invalid origin

925bd4c

".git/.scripts/commands/fmt/fmt.sh"

f2d8190

codekitz added 2 commits April 12, 2023 19:50

Merge branch 'master' of github.com:paritytech/substrate into gupnik/…

a210736

…force_origin

Merge branch 'master' of github.com:paritytech/substrate into gupnik/…

cc3e4d4

…force_origin

This was referenced Apr 13, 2023

Updates Benchmark macros to use linear! with range #13897

Closed

Updates Benchmark macro parsing to use Generic Argument #13919

Merged

codekitz added 2 commits April 14, 2023 22:54

Merge branch 'master' of github.com:paritytech/substrate into gupnik/…

7f80f26

…force_origin

updates param to use MaxCalls

3c9b744

sam0x17 approved these changes Apr 22, 2023

View reviewed changes

sam0x17 self-requested a review April 22, 2023 12:36

gupnik added 5 commits April 22, 2023 20:16

Fixes compilation error

24bf5de

Merge branch 'master' of github.com:paritytech/substrate into gupnik/…

1f0aeac

…force_origin

Updates doc comment

cad02d9

Fixes test outputs

2c52659

Fixes test output

60809ae

".git/.scripts/commands/fmt/fmt.sh"

a3e7e30

ggwpez approved these changes Apr 24, 2023

View reviewed changes

gupnik merged commit 9370f42 into master Apr 24, 2023

gupnik deleted the gupnik/force_origin branch April 24, 2023 12:04

kacperzuk-neti mentioned this pull request Jun 23, 2023

Polkadot v0.9.43 liberland/liberland_substrate#295

Merged

15 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds force_origin support #13845

Adds force_origin support #13845

gupnik commented Apr 6, 2023 •

edited by ggwpez

Loading

gupnik commented Apr 6, 2023

gupnik Apr 6, 2023

sam0x17 commented Apr 6, 2023 •

edited

Loading

gupnik commented Apr 7, 2023

command-bot bot commented Apr 7, 2023 •

edited

Loading

command-bot bot commented Apr 7, 2023

sam0x17 left a comment •

edited

Loading

sam0x17 Apr 22, 2023

gupnik Apr 22, 2023

ggwpez commented Apr 22, 2023

sam0x17 commented Apr 22, 2023

gupnik commented Apr 22, 2023

gupnik commented Apr 22, 2023

command-bot bot commented Apr 22, 2023 •

edited

Loading

command-bot bot commented Apr 22, 2023

ggwpez left a comment

Adds force_origin support #13845

Adds force_origin support #13845

Conversation

gupnik commented Apr 6, 2023 • edited by ggwpez Loading

gupnik commented Apr 6, 2023

gupnik Apr 6, 2023

Choose a reason for hiding this comment

sam0x17 commented Apr 6, 2023 • edited Loading

gupnik commented Apr 7, 2023

command-bot bot commented Apr 7, 2023 • edited Loading

command-bot bot commented Apr 7, 2023

sam0x17 left a comment • edited Loading

Choose a reason for hiding this comment

sam0x17 Apr 22, 2023

Choose a reason for hiding this comment

gupnik Apr 22, 2023

Choose a reason for hiding this comment

ggwpez commented Apr 22, 2023

sam0x17 commented Apr 22, 2023

gupnik commented Apr 22, 2023

gupnik commented Apr 22, 2023

command-bot bot commented Apr 22, 2023 • edited Loading

command-bot bot commented Apr 22, 2023

ggwpez left a comment

Choose a reason for hiding this comment

gupnik commented Apr 6, 2023 •

edited by ggwpez

Loading

sam0x17 commented Apr 6, 2023 •

edited

Loading

command-bot bot commented Apr 7, 2023 •

edited

Loading

sam0x17 left a comment •

edited

Loading

command-bot bot commented Apr 22, 2023 •

edited

Loading