membership: Restructure pallet into separate files #4536

vatsa287 · 2024-05-22T05:27:39Z

What does this PR do?
This PR separates membership pallet into separate files for lib, mock & tests.
Why are these changes needed?
Currently membership pallet consists of lib, mock & tests written into a single file.
Refactor it into separate files which makes it inline to other pallets and improves readability.
How were these changes implemented and what do they affect?
The PR will not have any affect.

Signed-off-by: Shreevatsa N i.mnshreevatsa@gmail.com

cla-bot-2021 · 2024-05-22T05:27:46Z

User @vatsa287, please sign the CLA here.

vatsa287 · 2024-05-22T05:41:51Z

Label required: T1-Frame.
Not able to add this into the PR.

xlc · 2024-05-22T05:52:58Z

you forget to commit the lib.rs file?

vatsa287 · 2024-05-22T06:10:07Z

you forget to commit the lib.rs file?

@xlc Sorry yes. I have updated the commit now.
Thanks.

substrate/frame/membership/src/benchmark.rs

substrate/frame/membership/src/tests.rs

ggwpez · 2024-05-24T20:33:17Z

Please check that everything still works when running the tests.

github-actions · 2024-05-26T06:31:35Z

Review required! Latest push from author must always be reviewed

vatsa287 · 2024-05-26T06:58:39Z

Please check that everything still works when running the tests.

Yes it works fine on my local setup.

vatsa@Shreevatsas-MacBook-Pro polkadot-sdk % cargo test -p pallet-membership --features=runtime-benchmarks
    Finished `test` profile [unoptimized + debuginfo] target(s) in 1.60s
     Running unittests src/lib.rs (target/debug/deps/pallet_membership-f44be527ad6bc1b4)

running 22 tests
test mock::__construct_runtime_integrity_test::runtime_integrity_tests ... ok
test mock::test_genesis_config_builds ... ok
test benchmarking::bench_clear_prime ... ok
test benchmarking::bench_set_prime ... ok
test benchmarking::bench_swap_member ... ok
test tests::add_member_works ... ok
test benchmarking::bench_change_key ... ok
test benchmarking::bench_reset_members ... ok
test benchmarking::bench_remove_member ... ok
test benchmarking::bench_add_member ... ok
test tests::change_key_with_same_caller_as_argument_changes_nothing ... ok
test tests::change_key_works_that_does_not_change_order ... ok
test tests::change_key_works ... ok
test tests::query_membership_works ... ok
test tests::swap_member_with_identical_arguments_changes_nothing ... ok
test tests::prime_member_works ... ok
test tests::remove_member_works ... ok
test tests::reset_members_works ... ok
test tests::swap_member_works ... ok
test tests::swap_member_works_that_does_not_change_order ... ok
test tests::migration_v4 ... ok
test tests::genesis_build_panics_with_duplicate_members - should panic ... ok

test result: ok. 22 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.02s

   Doc-tests pallet-membership

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

ggwpez · 2024-05-27T10:07:58Z

substrate/frame/membership/src/lib.rs

@@ -33,6 +33,15 @@ use sp_std::prelude::*;
 pub mod migrations;
 pub mod weights;

+#[cfg(any(feature = "mock", test))]


Does this mock feature exist? I dont think its needed otherwise.

Yes mock is the file where mock runtime is defined, required for test.

Signed-off-by: Shreevatsa N <i.mnshreevatsa@gmail.com>

vatsa287 · 2024-06-18T04:37:30Z

@ggwpez any other changes required? Could you please approve the workflow.
Thanks.

substrate/frame/membership/src/lib.rs

substrate/frame/membership/src/tests.rs

paritytech-cicd-pr · 2024-07-24T09:41:25Z

The CI pipeline was cancelled due to failure one of the required jobs.
Job name: cargo-clippy
Logs: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/6795541

vatsa287 · 2024-07-25T06:24:03Z

@ggwpez @bkchr
Thanks for the help!

- What does this PR do? This PR separates `membership` pallet into separate files for `lib`, `mock` & `tests`. - Why are these changes needed? Currently `membership` pallet consists of `lib`, `mock` & `tests` written into a single file. Refactor it into separate files which makes it inline to other pallets and improves readability. - How were these changes implemented and what do they affect? The PR will not have any affect. Signed-off-by: Shreevatsa N <i.mnshreevatsa@gmail.com> --------- Signed-off-by: Shreevatsa N <i.mnshreevatsa@gmail.com> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: Bastian Köcher <info@kchr.de>

* master: (27 commits) Bridges improved tests and nits (#5128) Fix misleading comment about RewardHandler in epm config (#3095) Introduce a workflow updating the wishlist leaderboards (#5085) membership: Restructure pallet into separate files (#4536) Fix after ring-proof api change (#5126) Bump paritytech/review-bot from 2.4.0 to 2.5.0 (#5057) Bump docker/login-action from 3.0.0 to 3.3.0 (#5109) Bump docker/build-push-action from 5.1.0 to 6.5.0 (#5108) Bump peter-evans/create-pull-request from 5.0.0 to 6.1.0 (#5093) Tx Payment: drop ED requirements for tx payments with exchangeable asset (#4488) Remove `pallet-getter` usage from pallet-transaction-payment (#4970) pallet macro: do not generate try-runtime related code when frame-support doesn't have try-runtime. (#5099) fix(chain-spec): ChainSpecBuilder with object as default genesis (#4345) Migrate BEEFY BLS crypto to bls12-381 curve (#4931) Bump clap from 4.5.9 to 4.5.10 in the known_good_semver group (#5120) Use jobserver in wasm-builder to limit concurrency of spawned cargo processes (#4946) include events for voting (#4613) [subsystem-bench] Add mocks for own assignments triggering (#5042) Remove not-audited warning (#5114) hotfix: blockchain/backend: Skip genesis leaf to unblock syncing (#5103) ...

vatsa287 requested a review from a team as a code owner May 22, 2024 05:27

vatsa287 force-pushed the refactor-membership branch from 92824db to 305beed Compare May 22, 2024 06:08

vatsa287 force-pushed the refactor-membership branch from 305beed to f5ed601 Compare May 22, 2024 10:20

ggwpez reviewed May 24, 2024

View reviewed changes

substrate/frame/membership/src/benchmark.rs Outdated Show resolved Hide resolved

ggwpez approved these changes May 24, 2024

View reviewed changes

ggwpez self-requested a review May 24, 2024 20:31

ggwpez reviewed May 24, 2024

View reviewed changes

substrate/frame/membership/src/tests.rs Show resolved Hide resolved

ggwpez self-requested a review May 24, 2024 20:32

vatsa287 force-pushed the refactor-membership branch 2 times, most recently from 5f37907 to 4ddacee Compare May 26, 2024 06:58

ggwpez reviewed May 27, 2024

View reviewed changes

ggwpez approved these changes May 27, 2024

View reviewed changes

vatsa287 force-pushed the refactor-membership branch from 4ddacee to a0dfd91 Compare May 27, 2024 10:58

github-actions bot requested a review from ggwpez May 27, 2024 10:58

vatsa287 force-pushed the refactor-membership branch from bb0f992 to 70da3a1 Compare May 28, 2024 08:21

vatsa287 added 2 commits May 29, 2024 12:26

membership: Resturcture pallet into separate files

1084130

Signed-off-by: Shreevatsa N <i.mnshreevatsa@gmail.com>

Address review comments

3ec6156

Signed-off-by: Shreevatsa N <i.mnshreevatsa@gmail.com>

vatsa287 force-pushed the refactor-membership branch from 70da3a1 to 3ec6156 Compare May 29, 2024 06:56

Merge branch 'master' into refactor-membership

ac796c8

bkchr approved these changes Jun 25, 2024

View reviewed changes

substrate/frame/membership/src/lib.rs Outdated Show resolved Hide resolved

substrate/frame/membership/src/tests.rs Outdated Show resolved Hide resolved

substrate/frame/membership/src/tests.rs Outdated Show resolved Hide resolved

bkchr added 2 commits June 25, 2024 13:57

Apply suggestions from code review

875bbe2

Merge branch 'master' into refactor-membership

b81b24e

bkchr enabled auto-merge June 25, 2024 11:57

bkchr added the R0-silent Changes should not be mentioned in any release notes label Jun 25, 2024

Merge branch 'master' into refactor-membership

32cb8f4

github-actions bot requested a review from bkchr June 25, 2024 16:43

Merge remote-tracking branch 'origin/master' into refactor-membership

b1ee834

Fix CI

ad1355e

ggwpez approved these changes Jul 24, 2024

View reviewed changes

FMT

d944698

bkchr added this pull request to the merge queue Jul 24, 2024

Merged via the queue into paritytech:master with commit f5e7eaf Jul 24, 2024
158 of 160 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

membership: Restructure pallet into separate files #4536

membership: Restructure pallet into separate files #4536

vatsa287 commented May 22, 2024 •

edited

Loading

cla-bot-2021 bot commented May 22, 2024

vatsa287 commented May 22, 2024

xlc commented May 22, 2024

vatsa287 commented May 22, 2024 •

edited

Loading

ggwpez commented May 24, 2024

github-actions bot commented May 26, 2024

vatsa287 commented May 26, 2024

ggwpez May 27, 2024

vatsa287 May 27, 2024 •

edited

Loading

vatsa287 commented Jun 18, 2024

paritytech-cicd-pr commented Jul 24, 2024

vatsa287 commented Jul 25, 2024

membership: Restructure pallet into separate files #4536

membership: Restructure pallet into separate files #4536

Conversation

vatsa287 commented May 22, 2024 • edited Loading

cla-bot-2021 bot commented May 22, 2024

vatsa287 commented May 22, 2024

xlc commented May 22, 2024

vatsa287 commented May 22, 2024 • edited Loading

ggwpez commented May 24, 2024

github-actions bot commented May 26, 2024

vatsa287 commented May 26, 2024

ggwpez May 27, 2024

Choose a reason for hiding this comment

vatsa287 May 27, 2024 • edited Loading

Choose a reason for hiding this comment

vatsa287 commented Jun 18, 2024

paritytech-cicd-pr commented Jul 24, 2024

vatsa287 commented Jul 25, 2024

vatsa287 commented May 22, 2024 •

edited

Loading

vatsa287 commented May 22, 2024 •

edited

Loading

vatsa287 May 27, 2024 •

edited

Loading