Remove `pallet::getter` usage from bridges/modules #7120

muraca · 2025-01-12T15:04:08Z

Description

Part of #3326

As per title, the pallet:getter usage has been removed from:

pallet-bridge-grandpa
pallet-bridge-messages
pallet-bridge-relayers

polkadot address: 12poSUQPtcF1HUPQGY3zZu2P8emuW9YnsPduA4XG3oCEfJVp

ggwpez · 2025-01-14T19:35:32Z

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs

@@ -916,7 +917,7 @@ impl_runtime_apis! {

 	impl bp_westend::WestendFinalityApi<Block> for Runtime {
 		fn best_finalized() -> Option<HeaderId<bp_westend::Hash, bp_westend::BlockNumber>> {
-			BridgeWestendGrandpa::best_finalized()
+			 pallet_bridge_grandpa::BestFinalized::<Runtime, Instance3>::get()


Huh that is a bit unfortunate that we have to pull in the Instances... first time that I see a downside of this migration.
For these cases we could still write a manual getter though.

For these cases we could still write a manual getter though.

Yes, I agree. It would also be less error-prone to avoid accidentally using an invalid InstanceXYZ, and it would significantly reduce the changes in this PR. There would only be a small internal change to the pallet.

I'll update the PR with a manual getter implementation and revert the changes on the runtimes

prdoc/pr_7120.prdoc

ggwpez · 2025-01-14T19:38:44Z

/tip small

substrate-tip-bot · 2025-01-14T19:39:18Z

@ggwpez A referendum for a small (20 DOT) tip was successfully submitted for @muraca (12poSUQPtcF1HUPQGY3zZu2P8emuW9YnsPduA4XG3oCEfJVp on polkadot).

Referendum number: 1385.

substrate-tip-bot · 2025-01-14T19:39:23Z

The referendum has appeared on Polkassembly.

bkontur · 2025-01-15T09:55:51Z

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs

@@ -916,7 +917,7 @@ impl_runtime_apis! {

 	impl bp_westend::WestendFinalityApi<Block> for Runtime {
 		fn best_finalized() -> Option<HeaderId<bp_westend::Hash, bp_westend::BlockNumber>> {
-			BridgeWestendGrandpa::best_finalized()
+			 pallet_bridge_grandpa::BestFinalized::<Runtime, Instance3>::get()


Suggested change

pallet_bridge_grandpa::BestFinalized::<Runtime, Instance3>::get()

pallet_bridge_grandpa::BestFinalized::<Runtime, bridge_common_config::BridgeGrandpaWestendInstance>::get()

bkontur · 2025-01-15T09:56:23Z

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs

@@ -970,7 +971,7 @@ impl_runtime_apis! {

 	impl bp_polkadot_bulletin::PolkadotBulletinFinalityApi<Block> for Runtime {
 		fn best_finalized() -> Option<bp_runtime::HeaderId<bp_polkadot_bulletin::Hash, bp_polkadot_bulletin::BlockNumber>> {
-			BridgePolkadotBulletinGrandpa::best_finalized()
+			 pallet_bridge_grandpa::BestFinalized::<Runtime, Instance4>::get()


Suggested change

pallet_bridge_grandpa::BestFinalized::<Runtime, Instance4>::get()

pallet_bridge_grandpa::BestFinalized::<Runtime, bridge_common_config::BridgeGrandpaRococoBulletinInstance>::get()

bkontur · 2025-01-15T09:59:35Z

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs

@@ -1343,7 +1344,7 @@ impl_runtime_apis! {
 					let bench_lane_id = <Self as BridgeMessagesConfig<bridge_to_westend_config::WithBridgeHubWestendMessagesInstance>>::bench_lane_id();
 					use bp_runtime::Chain;
 					let bridged_chain_id =<Self as pallet_bridge_messages::Config<bridge_to_westend_config::WithBridgeHubWestendMessagesInstance>>::BridgedChain::ID;
-					pallet_bridge_relayers::Pallet::<Runtime>::relayer_reward(
+					pallet_bridge_relayers::RelayerRewards::<Runtime>::get(


Suggested change

pallet_bridge_relayers::RelayerRewards::<Runtime>::get(

pallet_bridge_relayers::RelayerRewards::<Runtime, bridge_common_config::RelayersForLegacyLaneIdsMessagesInstance>::get(

bkontur · 2025-01-15T09:59:46Z

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs

@@ -63,6 +63,7 @@ use frame_support::{
 	construct_runtime, derive_impl,
 	dispatch::DispatchClass,
 	genesis_builder_helper::{build_state, get_preset},
+	instances::Instance1,


Suggested change

instances::Instance1,

bkontur · 2025-01-15T10:00:43Z

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs

@@ -849,7 +850,7 @@ impl_runtime_apis! {

 	impl bp_rococo::RococoFinalityApi<Block> for Runtime {
 		fn best_finalized() -> Option<HeaderId<bp_rococo::Hash, bp_rococo::BlockNumber>> {
-			BridgeRococoGrandpa::best_finalized()
+			 pallet_bridge_grandpa::BestFinalized::<Runtime, Instance1>::get()


Suggested change

pallet_bridge_grandpa::BestFinalized::<Runtime, Instance1>::get()

pallet_bridge_grandpa::BestFinalized::<Runtime, bridge_to_rococo_config::BridgeGrandpaRococoInstance>::get()

bkontur · 2025-01-15T10:00:59Z

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs

@@ -62,6 +62,7 @@ use frame_support::{
 	construct_runtime, derive_impl,
 	dispatch::DispatchClass,
 	genesis_builder_helper::{build_state, get_preset},
+	instances::{Instance3, Instance4},


Suggested change

instances::{Instance3, Instance4},

bkontur · 2025-01-15T10:01:45Z

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs

@@ -1224,7 +1225,7 @@ impl_runtime_apis! {
 					let bench_lane_id = <Self as BridgeMessagesConfig<bridge_to_rococo_config::WithBridgeHubRococoMessagesInstance>>::bench_lane_id();
 					use bp_runtime::Chain;
 					let bridged_chain_id =<Self as pallet_bridge_messages::Config<bridge_to_rococo_config::WithBridgeHubRococoMessagesInstance>>::BridgedChain::ID;
-					pallet_bridge_relayers::Pallet::<Runtime>::relayer_reward(
+					pallet_bridge_relayers::RelayerRewards::<Runtime>::get(


Suggested change

pallet_bridge_relayers::RelayerRewards::<Runtime>::get(

pallet_bridge_relayers::RelayerRewards::<Runtime, bridge_common_config::RelayersForLegacyLaneIdsMessagesInstance>::get(

bkontur · 2025-01-15T10:06:22Z

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs

@@ -916,7 +917,7 @@ impl_runtime_apis! {

 	impl bp_westend::WestendFinalityApi<Block> for Runtime {
 		fn best_finalized() -> Option<HeaderId<bp_westend::Hash, bp_westend::BlockNumber>> {
-			BridgeWestendGrandpa::best_finalized()
+			 pallet_bridge_grandpa::BestFinalized::<Runtime, Instance3>::get()


For these cases we could still write a manual getter though.

Yes, I agree. It would also be less error-prone to avoid accidentally using an invalid InstanceXYZ, and it would significantly reduce the changes in this PR. There would only be a small internal change to the pallet.

Co-authored-by: Oliver Tale-Yazdi <[email protected]>

muraca added 4 commits January 12, 2025 15:55

removed pallet::getter from pallet-bridge-grandpa

72ac9bf

removed pallet::getter from pallet-bridge-messages

c4a68d3

fix bridge hub runtimes

91e6411

removed pallet::getter from pallet-bridge-relayers

0d4e93b

muraca mentioned this pull request Jan 12, 2025

[Deprecation] remove pallet::getter usage from all pallets #3326

Open

63 tasks

muraca added 3 commits January 12, 2025 17:35

prdoc & fix

a7abd92

fix

d6d2c49

fix

dfce5dc

muraca marked this pull request as ready for review January 12, 2025 16:49

paritytech-review-bot bot requested a review from a team January 12, 2025 16:50

cargo fmt (finally!)

b91db67

ggwpez approved these changes Jan 14, 2025

View reviewed changes

ggwpez added the T2-pallets This PR/Issue is related to a particular pallet. label Jan 14, 2025

bkontur reviewed Jan 15, 2025

View reviewed changes

muraca and others added 2 commits January 15, 2025 15:11

Merge branch 'master' into getters/bridges-modules

5637d8e

Update prdoc/pr_7120.prdoc

25f5d8d

Co-authored-by: Oliver Tale-Yazdi <[email protected]>

paritytech-review-bot bot requested a review from a team January 15, 2025 14:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove `pallet::getter` usage from bridges/modules #7120

Remove `pallet::getter` usage from bridges/modules #7120

muraca commented Jan 12, 2025 •

edited

Loading

ggwpez Jan 14, 2025

bkontur Jan 15, 2025

muraca Jan 15, 2025

ggwpez commented Jan 14, 2025

substrate-tip-bot bot commented Jan 14, 2025

substrate-tip-bot bot commented Jan 14, 2025

bkontur Jan 15, 2025

bkontur Jan 15, 2025

bkontur Jan 15, 2025

bkontur Jan 15, 2025

bkontur Jan 15, 2025

bkontur Jan 15, 2025

bkontur Jan 15, 2025

bkontur Jan 15, 2025

	pallet_bridge_grandpa::BestFinalized::<Runtime, Instance3>::get()
	pallet_bridge_grandpa::BestFinalized::<Runtime, bridge_common_config::BridgeGrandpaWestendInstance>::get()

	pallet_bridge_relayers::RelayerRewards::<Runtime>::get(
	pallet_bridge_relayers::RelayerRewards::<Runtime, bridge_common_config::RelayersForLegacyLaneIdsMessagesInstance>::get(

Remove pallet::getter usage from bridges/modules #7120

Are you sure you want to change the base?

Remove pallet::getter usage from bridges/modules #7120

Conversation

muraca commented Jan 12, 2025 • edited Loading

Description

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ggwpez commented Jan 14, 2025

substrate-tip-bot bot commented Jan 14, 2025

substrate-tip-bot bot commented Jan 14, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Remove `pallet::getter` usage from bridges/modules #7120

Remove `pallet::getter` usage from bridges/modules #7120

muraca commented Jan 12, 2025 •

edited

Loading