-
Notifications
You must be signed in to change notification settings - Fork 101
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
kusama: General Admin to send Location mapping #383
Merged
fellowship-merge-bot
merged 6 commits into
polkadot-fellows:main
from
muharem:muharem-kusama-general-admin
Jul 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ad92061
kusama: General Admin to Location mapping
muharem dc0391f
tests
muharem c544bc2
changelog
muharem c5dc122
tests fix
muharem 8b4d0a7
cargo.lock update
muharem 2a586a5
Merge branch 'main' into muharem-kusama-general-admin
muharem File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
124 changes: 124 additions & 0 deletions
124
integration-tests/emulated/tests/people/people-kusama/src/tests/governance.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| // Copyright (C) Parity Technologies (UK) Ltd. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| use crate::*; | ||
| use frame_support::sp_runtime::traits::Dispatchable; | ||
| use kusama_runtime::governance::pallet_custom_origins::Origin::GeneralAdmin as GeneralAdminOrigin; | ||
|
|
||
| #[test] | ||
| fn general_admin_add_registrar() { | ||
| let registrar: AccountId = [1; 32].into(); | ||
| Kusama::execute_with(|| { | ||
| type Runtime = <Kusama as Chain>::Runtime; | ||
| type RuntimeCall = <Kusama as Chain>::RuntimeCall; | ||
| type RuntimeEvent = <Kusama as Chain>::RuntimeEvent; | ||
| type RuntimeOrigin = <Kusama as Chain>::RuntimeOrigin; | ||
| type PeopleCall = <PeopleKusama as Chain>::RuntimeCall; | ||
| type PeopleRuntime = <PeopleKusama as Chain>::Runtime; | ||
|
|
||
| let add_registrar_call = | ||
| PeopleCall::Identity(pallet_identity::Call::<PeopleRuntime>::add_registrar { | ||
| account: registrar.into(), | ||
| }); | ||
|
|
||
| let xcm_message = RuntimeCall::XcmPallet(pallet_xcm::Call::<Runtime>::send { | ||
| dest: bx!(VersionedLocation::V4(Location::new(0, [Parachain(1004)]))), | ||
| message: bx!(VersionedXcm::V4(Xcm(vec![ | ||
| UnpaidExecution { weight_limit: Unlimited, check_origin: None }, | ||
| Transact { | ||
| origin_kind: OriginKind::Xcm, | ||
| require_weight_at_most: Weight::from_parts(5_000_000_000, 500_000), | ||
| call: add_registrar_call.encode().into(), | ||
| } | ||
| ]))), | ||
| }); | ||
|
|
||
| let general_admin: RuntimeOrigin = GeneralAdminOrigin.into(); | ||
|
|
||
| assert_ok!(xcm_message.dispatch(general_admin)); | ||
|
|
||
| assert_expected_events!( | ||
| Kusama, | ||
| vec![ | ||
| RuntimeEvent::XcmPallet(pallet_xcm::Event::Sent { .. }) => {}, | ||
| ] | ||
| ); | ||
| }); | ||
|
|
||
| PeopleKusama::execute_with(|| { | ||
| type RuntimeEvent = <PeopleKusama as Chain>::RuntimeEvent; | ||
|
|
||
| assert_expected_events!( | ||
| PeopleKusama, | ||
| vec![ | ||
| RuntimeEvent::Identity(pallet_identity::Event::RegistrarAdded { .. }) => {}, | ||
| RuntimeEvent::MessageQueue(pallet_message_queue::Event::Processed { success: true, .. }) => {}, | ||
| ] | ||
| ); | ||
| }); | ||
| } | ||
|
|
||
| #[test] | ||
| fn relay_root_add_registrar() { | ||
| let registrar: AccountId = [1; 32].into(); | ||
| Kusama::execute_with(|| { | ||
| type Runtime = <Kusama as Chain>::Runtime; | ||
| type RuntimeCall = <Kusama as Chain>::RuntimeCall; | ||
| type RuntimeEvent = <Kusama as Chain>::RuntimeEvent; | ||
| type RuntimeOrigin = <Kusama as Chain>::RuntimeOrigin; | ||
| type PeopleCall = <PeopleKusama as Chain>::RuntimeCall; | ||
| type PeopleRuntime = <PeopleKusama as Chain>::Runtime; | ||
|
|
||
| let add_registrar_call = | ||
| PeopleCall::Identity(pallet_identity::Call::<PeopleRuntime>::add_registrar { | ||
| account: registrar.into(), | ||
| }); | ||
|
|
||
| let xcm_message = RuntimeCall::XcmPallet(pallet_xcm::Call::<Runtime>::send { | ||
| dest: bx!(VersionedLocation::V4(Location::new(0, [Parachain(1004)]))), | ||
| message: bx!(VersionedXcm::V4(Xcm(vec![ | ||
| UnpaidExecution { weight_limit: Unlimited, check_origin: None }, | ||
| Transact { | ||
| origin_kind: OriginKind::Superuser, | ||
| require_weight_at_most: Weight::from_parts(5_000_000_000, 500_000), | ||
| call: add_registrar_call.encode().into(), | ||
| } | ||
| ]))), | ||
| }); | ||
|
|
||
| let root: RuntimeOrigin = RuntimeOrigin::root(); | ||
|
|
||
| assert_ok!(xcm_message.dispatch(root)); | ||
|
|
||
| assert_expected_events!( | ||
| Kusama, | ||
| vec![ | ||
| RuntimeEvent::XcmPallet(pallet_xcm::Event::Sent { .. }) => {}, | ||
| ] | ||
| ); | ||
| }); | ||
|
|
||
| PeopleKusama::execute_with(|| { | ||
| type RuntimeEvent = <PeopleKusama as Chain>::RuntimeEvent; | ||
|
|
||
| assert_expected_events!( | ||
| PeopleKusama, | ||
| vec![ | ||
| RuntimeEvent::Identity(pallet_identity::Event::RegistrarAdded { .. }) => {}, | ||
| RuntimeEvent::MessageQueue(pallet_message_queue::Event::Processed { success: true, .. }) => {}, | ||
| ] | ||
| ); | ||
| }); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
124 changes: 124 additions & 0 deletions
124
integration-tests/emulated/tests/people/people-polkadot/src/tests/governance.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| // Copyright (C) Parity Technologies (UK) Ltd. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| use crate::*; | ||
| use frame_support::sp_runtime::traits::Dispatchable; | ||
| use polkadot_runtime::governance::pallet_custom_origins::Origin::GeneralAdmin as GeneralAdminOrigin; | ||
|
|
||
| #[test] | ||
| fn general_admin_add_registrar() { | ||
| let registrar: AccountId = [1; 32].into(); | ||
| Polkadot::execute_with(|| { | ||
| type Runtime = <Polkadot as Chain>::Runtime; | ||
| type RuntimeCall = <Polkadot as Chain>::RuntimeCall; | ||
| type RuntimeEvent = <Polkadot as Chain>::RuntimeEvent; | ||
| type RuntimeOrigin = <Polkadot as Chain>::RuntimeOrigin; | ||
| type PeopleCall = <PeoplePolkadot as Chain>::RuntimeCall; | ||
| type PeopleRuntime = <PeoplePolkadot as Chain>::Runtime; | ||
|
|
||
| let add_registrar_call = | ||
| PeopleCall::Identity(pallet_identity::Call::<PeopleRuntime>::add_registrar { | ||
| account: registrar.into(), | ||
| }); | ||
|
|
||
| let xcm_message = RuntimeCall::XcmPallet(pallet_xcm::Call::<Runtime>::send { | ||
| dest: bx!(VersionedLocation::V4(Location::new(0, [Parachain(1004)]))), | ||
| message: bx!(VersionedXcm::V4(Xcm(vec![ | ||
| UnpaidExecution { weight_limit: Unlimited, check_origin: None }, | ||
| Transact { | ||
| origin_kind: OriginKind::Xcm, | ||
| require_weight_at_most: Weight::from_parts(5_000_000_000, 500_000), | ||
| call: add_registrar_call.encode().into(), | ||
| } | ||
| ]))), | ||
| }); | ||
|
|
||
| let general_admin: RuntimeOrigin = GeneralAdminOrigin.into(); | ||
|
|
||
| assert_ok!(xcm_message.dispatch(general_admin)); | ||
|
|
||
| assert_expected_events!( | ||
| Polkadot, | ||
| vec![ | ||
| RuntimeEvent::XcmPallet(pallet_xcm::Event::Sent { .. }) => {}, | ||
| ] | ||
| ); | ||
| }); | ||
|
|
||
| PeoplePolkadot::execute_with(|| { | ||
| type RuntimeEvent = <PeoplePolkadot as Chain>::RuntimeEvent; | ||
|
|
||
| assert_expected_events!( | ||
| PeoplePolkadot, | ||
| vec![ | ||
| RuntimeEvent::Identity(pallet_identity::Event::RegistrarAdded { .. }) => {}, | ||
| RuntimeEvent::MessageQueue(pallet_message_queue::Event::Processed { success: true, .. }) => {}, | ||
| ] | ||
| ); | ||
| }); | ||
| } | ||
|
|
||
| #[test] | ||
| fn relay_root_add_registrar() { | ||
| let registrar: AccountId = [1; 32].into(); | ||
| Polkadot::execute_with(|| { | ||
| type Runtime = <Polkadot as Chain>::Runtime; | ||
| type RuntimeCall = <Polkadot as Chain>::RuntimeCall; | ||
| type RuntimeEvent = <Polkadot as Chain>::RuntimeEvent; | ||
| type RuntimeOrigin = <Polkadot as Chain>::RuntimeOrigin; | ||
| type PeopleCall = <PeoplePolkadot as Chain>::RuntimeCall; | ||
| type PeopleRuntime = <PeoplePolkadot as Chain>::Runtime; | ||
|
|
||
| let add_registrar_call = | ||
| PeopleCall::Identity(pallet_identity::Call::<PeopleRuntime>::add_registrar { | ||
| account: registrar.into(), | ||
| }); | ||
|
|
||
| let xcm_message = RuntimeCall::XcmPallet(pallet_xcm::Call::<Runtime>::send { | ||
| dest: bx!(VersionedLocation::V4(Location::new(0, [Parachain(1004)]))), | ||
| message: bx!(VersionedXcm::V4(Xcm(vec![ | ||
| UnpaidExecution { weight_limit: Unlimited, check_origin: None }, | ||
| Transact { | ||
| origin_kind: OriginKind::Superuser, | ||
| require_weight_at_most: Weight::from_parts(5_000_000_000, 500_000), | ||
| call: add_registrar_call.encode().into(), | ||
| } | ||
| ]))), | ||
| }); | ||
|
|
||
| let root: RuntimeOrigin = RuntimeOrigin::root(); | ||
|
|
||
| assert_ok!(xcm_message.dispatch(root)); | ||
|
|
||
| assert_expected_events!( | ||
| Polkadot, | ||
| vec![ | ||
| RuntimeEvent::XcmPallet(pallet_xcm::Event::Sent { .. }) => {}, | ||
| ] | ||
| ); | ||
| }); | ||
|
|
||
| PeoplePolkadot::execute_with(|| { | ||
| type RuntimeEvent = <PeoplePolkadot as Chain>::RuntimeEvent; | ||
|
|
||
| assert_expected_events!( | ||
| PeoplePolkadot, | ||
| vec![ | ||
| RuntimeEvent::Identity(pallet_identity::Event::RegistrarAdded { .. }) => {}, | ||
| RuntimeEvent::MessageQueue(pallet_message_queue::Event::Processed { success: true, .. }) => {}, | ||
| ] | ||
| ); | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit:
Deduplicate
general_admin_add_registrarandrelay_root_add_registrartests code since they do the same thing with same result, just using different origins.Keep both tests, that just call helper fn with different origins.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I left one test function
relay_commands_add_registrarwith a loop over two origins.I personally do not like function abstraction when there is no clear (semantic) abstraction. This is often the case for tests. Frequently, we just move duplicated code into a function with a long name, which makes tests harder to read and maintain. I prefer copy-pasting over poor abstraction. Additionally, such abstractions introduce a variety of different styles to the codebase. I also prefer consistency in code style. A test framework is usually helpful in maintaining this consistency. For example, in my case, a data provider for a test function could be used.