Skip to content

Commit a9985c0

Browse files
serban300serban300
authored
Use named parameters for indirect calls (paritytech#1823)
1 parent 8acefc5 commit a9985c0

File tree

12 files changed

+77
-43
lines changed

12 files changed

+77
-43
lines changed

‎modules/grandpa/src/lib.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,15 +1178,18 @@ mod tests {
11781178

11791179
let direct_initialize_call =
11801180
Call::<TestRuntime>::initialize { init_data: init_data.clone() };
1181-
let indirect_initialize_call = BridgeGrandpaCall::<TestHeader>::initialize(init_data);
1181+
let indirect_initialize_call = BridgeGrandpaCall::<TestHeader>::initialize { init_data };
11821182
assert_eq!(direct_initialize_call.encode(), indirect_initialize_call.encode());
11831183

11841184
let direct_submit_finality_proof_call = Call::<TestRuntime>::submit_finality_proof {
11851185
finality_target: Box::new(header.clone()),
11861186
justification: justification.clone(),
11871187
};
11881188
let indirect_submit_finality_proof_call =
1189-
BridgeGrandpaCall::<TestHeader>::submit_finality_proof(Box::new(header), justification);
1189+
BridgeGrandpaCall::<TestHeader>::submit_finality_proof {
1190+
finality_target: Box::new(header),
1191+
justification,
1192+
};
11901193
assert_eq!(
11911194
direct_submit_finality_proof_call.encode(),
11921195
indirect_submit_finality_proof_call.encode()

‎modules/messages/src/lib.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1928,12 +1928,12 @@ mod tests {
19281928
AccountId,
19291929
TestMessagesProof,
19301930
TestMessagesDeliveryProof,
1931-
>::receive_messages_proof(
1932-
account_id,
1933-
message_proof,
1934-
1,
1935-
REGULAR_PAYLOAD.declared_weight,
1936-
);
1931+
>::receive_messages_proof {
1932+
relayer_id_at_bridged_chain: account_id,
1933+
proof: message_proof,
1934+
messages_count: 1,
1935+
dispatch_weight: REGULAR_PAYLOAD.declared_weight,
1936+
};
19371937
assert_eq!(
19381938
direct_receive_messages_proof_call.encode(),
19391939
indirect_receive_messages_proof_call.encode()
@@ -1948,10 +1948,10 @@ mod tests {
19481948
AccountId,
19491949
TestMessagesProof,
19501950
TestMessagesDeliveryProof,
1951-
>::receive_messages_delivery_proof(
1952-
message_delivery_proof,
1953-
unrewarded_relayer_state,
1954-
);
1951+
>::receive_messages_delivery_proof {
1952+
proof: message_delivery_proof,
1953+
relayers_state: unrewarded_relayer_state,
1954+
};
19551955
assert_eq!(
19561956
direct_receive_messages_delivery_proof_call.encode(),
19571957
indirect_receive_messages_delivery_proof_call.encode()

‎modules/parachains/src/lib.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,8 +1513,11 @@ mod tests {
15131513
parachains: parachains.clone(),
15141514
parachain_heads_proof: proof.clone(),
15151515
};
1516-
let indirect_submit_parachain_heads_call =
1517-
BridgeParachainCall::submit_parachain_heads(relay_header_id, parachains, proof);
1516+
let indirect_submit_parachain_heads_call = BridgeParachainCall::submit_parachain_heads {
1517+
at_relay_block: relay_header_id,
1518+
parachains,
1519+
parachain_heads_proof: proof,
1520+
};
15181521
assert_eq!(
15191522
direct_submit_parachain_heads_call.encode(),
15201523
indirect_submit_parachain_heads_call.encode()

‎primitives/header-chain/src/lib.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,13 @@ impl<Number: Codec> ConsensusLogReader for GrandpaConsensusLogReader<Number> {
176176
pub enum BridgeGrandpaCall<Header: HeaderT> {
177177
/// `pallet-bridge-grandpa::Call::submit_finality_proof`
178178
#[codec(index = 0)]
179-
submit_finality_proof(Box<Header>, justification::GrandpaJustification<Header>),
179+
submit_finality_proof {
180+
finality_target: Box<Header>,
181+
justification: justification::GrandpaJustification<Header>,
182+
},
180183
/// `pallet-bridge-grandpa::Call::initialize`
181184
#[codec(index = 1)]
182-
initialize(InitializationData<Header>),
185+
initialize { init_data: InitializationData<Header> },
183186
}
184187

185188
/// The `BridgeGrandpaCall` used by a chain.

‎primitives/messages/src/lib.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,10 +397,18 @@ where
397397
pub enum BridgeMessagesCall<AccountId, MessagesProof, MessagesDeliveryProof> {
398398
/// `pallet-bridge-messages::Call::receive_messages_proof`
399399
#[codec(index = 2)]
400-
receive_messages_proof(AccountId, MessagesProof, u32, Weight),
400+
receive_messages_proof {
401+
relayer_id_at_bridged_chain: AccountId,
402+
proof: MessagesProof,
403+
messages_count: u32,
404+
dispatch_weight: Weight,
405+
},
401406
/// `pallet-bridge-messages::Call::receive_messages_delivery_proof`
402407
#[codec(index = 3)]
403-
receive_messages_delivery_proof(MessagesDeliveryProof, UnrewardedRelayersState),
408+
receive_messages_delivery_proof {
409+
proof: MessagesDeliveryProof,
410+
relayers_state: UnrewardedRelayersState,
411+
},
404412
}
405413

406414
#[cfg(test)]

‎primitives/parachains/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ impl ParaStoredHeaderDataBuilder for C {
157157
pub enum BridgeParachainCall {
158158
/// `pallet-bridge-parachains::Call::submit_parachain_heads`
159159
#[codec(index = 0)]
160-
submit_parachain_heads(
161-
(RelayBlockNumber, RelayBlockHash),
162-
Vec<(ParaId, ParaHash)>,
163-
ParaHeadsProof,
164-
),
160+
submit_parachain_heads {
161+
at_relay_block: (RelayBlockNumber, RelayBlockHash),
162+
parachains: Vec<(ParaId, ParaHash)>,
163+
parachain_heads_proof: ParaHeadsProof,
164+
},
165165
}

‎relays/bin-substrate/src/chains/rococo_parachains_to_bridge_hub_wococo.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ impl SubmitParachainHeadsCallBuilder<BridgeHubRococoToBridgeHubWococo>
5151
parachain_heads_proof: ParaHeadsProof,
5252
) -> CallOf<relay_bridge_hub_wococo_client::BridgeHubWococo> {
5353
relay_bridge_hub_wococo_client::runtime::Call::BridgeRococoParachain(
54-
relay_bridge_hub_wococo_client::runtime::BridgeParachainCall::submit_parachain_heads(
55-
(at_relay_block.0, at_relay_block.1),
54+
relay_bridge_hub_wococo_client::runtime::BridgeParachainCall::submit_parachain_heads {
55+
at_relay_block: (at_relay_block.0, at_relay_block.1),
5656
parachains,
5757
parachain_heads_proof,
58-
),
58+
},
5959
)
6060
}
6161
}

‎relays/bin-substrate/src/chains/wococo_parachains_to_bridge_hub_rococo.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ impl SubmitParachainHeadsCallBuilder<BridgeHubWococoToBridgeHubRococo>
5151
parachain_heads_proof: ParaHeadsProof,
5252
) -> CallOf<relay_bridge_hub_rococo_client::BridgeHubRococo> {
5353
relay_bridge_hub_rococo_client::runtime::Call::BridgeWococoParachain(
54-
bp_parachains::BridgeParachainCall::submit_parachain_heads(
55-
(at_relay_block.0, at_relay_block.1),
54+
bp_parachains::BridgeParachainCall::submit_parachain_heads {
55+
at_relay_block: (at_relay_block.0, at_relay_block.1),
5656
parachains,
5757
parachain_heads_proof,
58-
),
58+
},
5959
)
6060
}
6161
}

‎relays/bin-substrate/src/cli/init_bridge.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,10 @@ impl BridgeInitializer for MillauToRialtoParachainCliBridge {
125125
) -> <Self::Target as Chain>::Call {
126126
use relay_rialto_parachain_client::runtime;
127127

128-
let initialize_call = runtime::Call::BridgeMillauGrandpa(
129-
runtime::BridgeMillauGrandpaCall::initialize(init_data),
130-
);
128+
let initialize_call =
129+
runtime::Call::BridgeMillauGrandpa(runtime::BridgeMillauGrandpaCall::initialize {
130+
init_data,
131+
});
131132
let sudo_call = SudoCall::sudo(Box::new(initialize_call));
132133
runtime::Call::Sudo(sudo_call)
133134
}
@@ -176,7 +177,9 @@ impl BridgeInitializer for RococoToBridgeHubWococoCliBridge {
176177
init_data: <Self::Engine as Engine<Self::Source>>::InitializationData,
177178
) -> <Self::Target as Chain>::Call {
178179
relay_bridge_hub_wococo_client::runtime::Call::BridgeRococoGrandpa(
179-
relay_bridge_hub_wococo_client::runtime::BridgeRococoGrandpaCall::initialize(init_data),
180+
relay_bridge_hub_wococo_client::runtime::BridgeRococoGrandpaCall::initialize {
181+
init_data,
182+
},
180183
)
181184
}
182185
}
@@ -188,7 +191,9 @@ impl BridgeInitializer for WococoToBridgeHubRococoCliBridge {
188191
init_data: <Self::Engine as Engine<Self::Source>>::InitializationData,
189192
) -> <Self::Target as Chain>::Call {
190193
relay_bridge_hub_rococo_client::runtime::Call::BridgeWococoGrandpa(
191-
relay_bridge_hub_rococo_client::runtime::BridgeWococoGrandpaCall::initialize(init_data),
194+
relay_bridge_hub_rococo_client::runtime::BridgeWococoGrandpaCall::initialize {
195+
init_data,
196+
},
192197
)
193198
}
194199
}

‎relays/client-bridge-hub-wococo/src/runtime_wrapper.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ mod tests {
9696
set_id: 6,
9797
operating_mode: BasicOperatingMode::Normal,
9898
};
99-
let call = BridgeRococoGrandpaCall::initialize(init_data);
99+
let call = BridgeRococoGrandpaCall::initialize { init_data };
100100
let tx = Call::BridgeRococoGrandpa(call);
101101

102102
// encode call as hex string

‎relays/lib-substrate-relay/src/finality/mod.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,12 @@ macro_rules! generate_mocked_submit_finality_proof_call_builder {
156156
) -> relay_substrate_client::CallOf<
157157
<$pipeline as $crate::finality::SubstrateFinalitySyncPipeline>::TargetChain
158158
> {
159-
$bridge_grandpa($submit_finality_proof(Box::new(header.into_inner()), proof))
159+
bp_runtime::paste::item! {
160+
$bridge_grandpa($submit_finality_proof {
161+
finality_target: Box::new(header.into_inner()),
162+
justification: proof
163+
})
164+
}
160165
}
161166
}
162167
};

‎relays/lib-substrate-relay/src/messages_lane.rs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,14 @@ macro_rules! generate_mocked_receive_message_proof_call_builder {
335335
) -> relay_substrate_client::CallOf<
336336
<$pipeline as $crate::messages_lane::SubstrateMessageLane>::TargetChain
337337
> {
338-
$bridge_messages($receive_messages_proof(
339-
relayer_id_at_source,
340-
proof.1,
341-
messages_count,
342-
dispatch_weight,
343-
))
338+
bp_runtime::paste::item! {
339+
$bridge_messages($receive_messages_proof {
340+
relayer_id_at_bridged_chain: relayer_id_at_source,
341+
proof: proof.1,
342+
messages_count: messages_count,
343+
dispatch_weight: dispatch_weight,
344+
})
345+
}
344346
}
345347
}
346348
};
@@ -424,7 +426,12 @@ macro_rules! generate_mocked_receive_message_delivery_proof_call_builder {
424426
) -> relay_substrate_client::CallOf<
425427
<$pipeline as $crate::messages_lane::SubstrateMessageLane>::SourceChain
426428
> {
427-
$bridge_messages($receive_messages_delivery_proof(proof.1, proof.0))
429+
bp_runtime::paste::item! {
430+
$bridge_messages($receive_messages_delivery_proof {
431+
proof: proof.1,
432+
relayers_state: proof.0
433+
})
434+
}
428435
}
429436
}
430437
};

0 commit comments

Comments
 (0)