@@ -933,9 +933,10 @@ impl_runtime_apis! {
933933
934934 let mut list = Vec :: <BenchmarkList >:: new( ) ;
935935
936- list_benchmark!( list, extra, pallet_bridge_messages, MessagesBench :: <Runtime , WithRialtoMessagesInstance >) ;
936+ list_benchmark!( list, extra, RialtoParachainMessages , MessagesBench :: <Runtime , WithRialtoParachainMessagesInstance >) ;
937+ list_benchmark!( list, extra, RialtoMessages , MessagesBench :: <Runtime , WithRialtoMessagesInstance >) ;
937938 list_benchmark!( list, extra, pallet_bridge_grandpa, BridgeRialtoGrandpa ) ;
938- list_benchmark!( list, extra, pallet_bridge_parachains, ParachainsBench :: <Runtime , WithRialtoMessagesInstance >) ;
939+ list_benchmark!( list, extra, pallet_bridge_parachains, ParachainsBench :: <Runtime , WithRialtoParachainsInstance >) ;
939940 list_benchmark!( list, extra, pallet_bridge_relayers, RelayersBench :: <Runtime >) ;
940941
941942 let storage_info = AllPalletsWithSystem :: storage_info( ) ;
@@ -964,7 +965,12 @@ impl_runtime_apis! {
964965 let mut batches = Vec :: <BenchmarkBatch >:: new( ) ;
965966 let params = ( & config, & whitelist) ;
966967
967- use bridge_runtime_common:: messages_benchmarking:: { prepare_message_delivery_proof_from_grandpa_chain, prepare_message_proof_from_grandpa_chain} ;
968+ use bridge_runtime_common:: messages_benchmarking:: {
969+ prepare_message_delivery_proof_from_grandpa_chain,
970+ prepare_message_delivery_proof_from_parachain,
971+ prepare_message_proof_from_grandpa_chain,
972+ prepare_message_proof_from_parachain,
973+ } ;
968974 use pallet_bridge_messages:: benchmarking:: {
969975 Pallet as MessagesBench ,
970976 Config as MessagesConfig ,
@@ -980,28 +986,66 @@ impl_runtime_apis! {
980986 Config as RelayersConfig ,
981987 } ;
982988 use rialto_messages:: WithRialtoMessageBridge ;
989+ use rialto_parachain_messages:: WithRialtoParachainMessageBridge ;
990+
991+ impl MessagesConfig <WithRialtoParachainMessagesInstance > for Runtime {
992+ fn prepare_message_proof(
993+ params: MessageProofParams ,
994+ ) -> ( rialto_messages:: FromRialtoMessagesProof , Weight ) {
995+ prepare_message_proof_from_parachain:: <
996+ Runtime ,
997+ WithRialtoParachainsInstance ,
998+ WithRialtoParachainMessageBridge ,
999+ >( params)
1000+ }
1001+
1002+ fn prepare_message_delivery_proof(
1003+ params: MessageDeliveryProofParams <Self :: AccountId >,
1004+ ) -> rialto_messages:: ToRialtoMessagesDeliveryProof {
1005+ prepare_message_delivery_proof_from_parachain:: <
1006+ Runtime ,
1007+ WithRialtoParachainsInstance ,
1008+ WithRialtoParachainMessageBridge ,
1009+ >( params)
1010+ }
1011+
1012+ fn is_relayer_rewarded( relayer: & Self :: AccountId ) -> bool {
1013+ use bridge_runtime_common:: messages:: MessageBridge ;
1014+
1015+ let lane = <Self as MessagesConfig <WithRialtoParachainMessagesInstance >>:: bench_lane_id( ) ;
1016+ let bridged_chain_id = WithRialtoParachainMessageBridge :: BRIDGED_CHAIN_ID ;
1017+ pallet_bridge_relayers:: Pallet :: <Runtime >:: relayer_reward(
1018+ relayer,
1019+ RewardsAccountParams :: new( lane, bridged_chain_id, RewardsAccountOwner :: BridgedChain )
1020+ ) . is_some( )
1021+ }
1022+ }
9831023
9841024 impl MessagesConfig <WithRialtoMessagesInstance > for Runtime {
9851025 fn prepare_message_proof(
9861026 params: MessageProofParams ,
9871027 ) -> ( rialto_messages:: FromRialtoMessagesProof , Weight ) {
988- prepare_message_proof_from_grandpa_chain:: <Runtime , RialtoGrandpaInstance , WithRialtoMessageBridge >(
989- params,
990- )
1028+ prepare_message_proof_from_grandpa_chain:: <
1029+ Runtime ,
1030+ RialtoGrandpaInstance ,
1031+ WithRialtoMessageBridge ,
1032+ >( params)
9911033 }
9921034
9931035 fn prepare_message_delivery_proof(
9941036 params: MessageDeliveryProofParams <Self :: AccountId >,
9951037 ) -> rialto_messages:: ToRialtoMessagesDeliveryProof {
996- prepare_message_delivery_proof_from_grandpa_chain:: <Runtime , RialtoGrandpaInstance , WithRialtoMessageBridge >(
997- params,
998- )
1038+ prepare_message_delivery_proof_from_grandpa_chain:: <
1039+ Runtime ,
1040+ RialtoGrandpaInstance ,
1041+ WithRialtoMessageBridge ,
1042+ >( params)
9991043 }
10001044
10011045 fn is_relayer_rewarded( relayer: & Self :: AccountId ) -> bool {
10021046 use bridge_runtime_common:: messages:: MessageBridge ;
10031047
1004- let lane = Self :: bench_lane_id( ) ;
1048+ let lane = < Self as MessagesConfig < WithRialtoMessagesInstance >> :: bench_lane_id( ) ;
10051049 let bridged_chain_id = WithRialtoMessageBridge :: BRIDGED_CHAIN_ID ;
10061050 pallet_bridge_relayers:: Pallet :: <Runtime >:: relayer_reward(
10071051 relayer,
@@ -1026,7 +1070,10 @@ impl_runtime_apis! {
10261070 bp_polkadot_core:: parachains:: ParaHeadsProof ,
10271071 Vec <( bp_polkadot_core:: parachains:: ParaId , bp_polkadot_core:: parachains:: ParaHash ) >,
10281072 ) {
1029- bridge_runtime_common:: parachains_benchmarking:: prepare_parachain_heads_proof:: <Runtime , WithRialtoParachainsInstance >(
1073+ bridge_runtime_common:: parachains_benchmarking:: prepare_parachain_heads_proof:: <
1074+ Runtime ,
1075+ WithRialtoParachainsInstance ,
1076+ >(
10301077 parachains,
10311078 parachain_head_size,
10321079 proof_size,
@@ -1051,7 +1098,13 @@ impl_runtime_apis! {
10511098 add_benchmark!(
10521099 params,
10531100 batches,
1054- pallet_bridge_messages,
1101+ RialtoParachainMessages ,
1102+ MessagesBench :: <Runtime , WithRialtoParachainMessagesInstance >
1103+ ) ;
1104+ add_benchmark!(
1105+ params,
1106+ batches,
1107+ RialtoMessages ,
10551108 MessagesBench :: <Runtime , WithRialtoMessagesInstance >
10561109 ) ;
10571110 add_benchmark!( params, batches, pallet_bridge_grandpa, BridgeRialtoGrandpa ) ;
0 commit comments