Skip to content

Commit d8c4acd

Browse files
rnbguyrnbguy
committed
refactor after prefix rm
1 parent 8ec343e commit d8c4acd

File tree

4 files changed

+3
-56
lines changed

4 files changed

+3
-56
lines changed

‎ibc-eureka-core/ics04-channel/src/handler/acknowledgement.rs‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,8 @@ where
3535
ExecCtx: ExecutionContext,
3636
{
3737
let packet = &msg.packet;
38-
let payload = &packet.payloads[0];
3938

40-
let (source_prefix, _source_port) = &payload.header.source_port;
4139
let channel_target_client_on_source = &packet.header.target_client_on_source;
42-
let (target_prefix, _target_port) = &payload.header.target_port;
4340
let channel_source_client_on_target = &packet.header.source_client_on_target;
4441
let seq_on_a = &packet.header.seq_on_a;
4542

@@ -50,9 +47,7 @@ where
5047

5148
let commitment_path_on_a = CommitmentPath::new(
5249
channel_source_client_on_target.as_ref(),
53-
&format!("{source_prefix:?}"),
5450
channel_target_client_on_source.as_ref(),
55-
&format!("{target_prefix:?}"),
5651
seq_on_a,
5752
);
5853

@@ -102,18 +97,14 @@ where
10297
let packet = &msg.packet;
10398
let payload = &packet.payloads[0];
10499

105-
let (source_prefix, _source_port) = &payload.header.source_port;
106100
let channel_target_client_on_source = &packet.header.target_client_on_source;
107-
let (target_prefix, _target_port) = &payload.header.target_port;
108101
let channel_source_client_on_target = &packet.header.source_client_on_target;
109102
let seq_on_a = &packet.header.seq_on_a;
110103
let data = &payload.data;
111104

112105
let commitment_path_on_a = CommitmentPath::new(
113106
channel_source_client_on_target.as_ref(),
114-
&format!("{source_prefix:?}"),
115107
channel_target_client_on_source.as_ref(),
116-
&format!("{target_prefix:?}"),
117108
seq_on_a,
118109
);
119110

@@ -167,15 +158,13 @@ where
167158
let ack_commitment = compute_ack_commitment(&msg.acknowledgement);
168159
let ack_path_on_b = AckPath::new(
169160
channel_source_client_on_target.as_ref(),
170-
&format!("{source_prefix:?}"),
171161
channel_target_client_on_source.as_ref(),
172-
&format!("{target_prefix:?}"),
173162
seq_on_a,
174163
);
175164

176165
// Verify the proof for the packet against the chain store.
177166
target_client_on_source.verify_membership(
178-
target_prefix,
167+
&target_prefix,
179168
&msg.proof_acked_on_b,
180169
consensus_state_of_b_on_a.root(),
181170
Path::AckV2(ack_path_on_b),

‎ibc-eureka-core/ics04-channel/src/handler/recv_packet.rs‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,8 @@ where
3434
ExecCtx: ExecutionContext,
3535
{
3636
let packet = &msg.packet;
37-
let payload = &packet.payloads[0];
3837

39-
let (source_prefix, _source_port) = &payload.header.source_port;
4038
let channel_source_client_on_target = &packet.header.source_client_on_target;
41-
let (target_prefix, _target_port) = &payload.header.target_port;
4239
let channel_target_client_on_source = &packet.header.target_client_on_source;
4340
let seq_on_a = &packet.header.seq_on_a;
4441

@@ -48,9 +45,7 @@ where
4845
let packet_already_received = {
4946
let receipt_path_on_b = ReceiptPath::new(
5047
channel_source_client_on_target.as_ref(),
51-
&format!("{source_prefix:?}"),
5248
channel_target_client_on_source.as_ref(),
53-
&format!("{target_prefix:?}"),
5449
seq_on_a,
5550
);
5651
ctx_b.get_packet_receipt(&receipt_path_on_b)?.is_ok()
@@ -69,18 +64,14 @@ where
6964
{
7065
let seq_recv_path_on_b = SeqRecvPath::new(
7166
channel_source_client_on_target.as_ref(),
72-
&format!("{source_prefix:?}"),
7367
channel_target_client_on_source.as_ref(),
74-
&format!("{target_prefix:?}"),
7568
);
7669
let next_seq_recv = ctx_b.get_next_sequence_recv(&seq_recv_path_on_b)?;
7770
ctx_b.store_next_sequence_recv(&seq_recv_path_on_b, next_seq_recv.increment())?;
7871
}
7972
let ack_path_on_b = AckPath::new(
8073
channel_source_client_on_target.as_ref(),
81-
&format!("{source_prefix:?}"),
8274
channel_target_client_on_source.as_ref(),
83-
&format!("{target_prefix:?}"),
8475
seq_on_a,
8576
);
8677
// `writeAcknowledgement` handler state changes
@@ -124,9 +115,7 @@ where
124115
let packet = &msg.packet;
125116
let payload = &packet.payloads[0];
126117

127-
let (source_prefix, _source_port) = &payload.header.source_port;
128118
let channel_target_client_on_source = &packet.header.target_client_on_source;
129-
let (target_prefix, _target_port) = &payload.header.target_port;
130119
let channel_source_client_on_target = &packet.header.source_client_on_target;
131120
let seq_on_a = &packet.header.seq_on_a;
132121
let data = &payload.data;
@@ -179,15 +168,13 @@ where
179168
);
180169
let commitment_path_on_a = CommitmentPath::new(
181170
channel_source_client_on_target.as_ref(),
182-
&format!("{source_prefix:?}"),
183171
channel_target_client_on_source.as_ref(),
184-
&format!("{target_prefix:?}"),
185172
seq_on_a,
186173
);
187174

188175
// Verify the proof for the packet against the chain store.
189176
source_client_on_target.verify_membership(
190-
source_prefix,
177+
&source_prefix,
191178
&msg.proof_commitment_on_a,
192179
consensus_state_of_a_on_b.root(),
193180
Path::CommitmentV2(commitment_path_on_a),
@@ -214,19 +201,14 @@ where
214201
Ctx: ValidationContext,
215202
{
216203
let packet = &msg.packet;
217-
let payload = &packet.payloads[0];
218204

219205
let channel_source_client_on_target = &packet.header.source_client_on_target;
220-
let (target_prefix, _target_port) = &payload.header.target_port;
221206
let channel_target_client_on_source = &packet.header.target_client_on_source;
222-
let (source_prefix, _source_port) = &payload.header.source_port;
223207
let seq_on_a = &packet.header.seq_on_a;
224208

225209
let ack_path_on_b = AckPath::new(
226210
channel_source_client_on_target.as_ref(),
227-
&format!("{source_prefix:?}"),
228211
channel_target_client_on_source.as_ref(),
229-
&format!("{target_prefix:?}"),
230212
seq_on_a,
231213
);
232214
if ctx_b.get_packet_acknowledgement(&ack_path_on_b).is_ok() {

‎ibc-eureka-core/ics04-channel/src/handler/send_packet.rs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ pub fn send_packet_validate(
3232
return Err(ChannelError::MissingTimeout);
3333
}
3434

35-
let payload = &packet.payloads[0];
36-
37-
let (source_prefix, _source_port) = &payload.header.source_port;
3835
let channel_target_client_on_source = &packet.header.target_client_on_source;
39-
let (target_prefix, _target_port) = &payload.header.target_port;
4036
let channel_source_client_on_target = &packet.header.source_client_on_target;
4137
let seq_on_a = &packet.header.seq_on_a;
4238

@@ -82,9 +78,7 @@ pub fn send_packet_validate(
8278
let seq_send_path_on_a = SeqSendPath::new(
8379
channel_source_client_on_target.as_ref(),
8480
// todo(rano): use ascii encoding of the bytes
85-
&format!("{source_prefix:?}"),
8681
channel_target_client_on_source.as_ref(),
87-
&format!("{target_prefix:?}"),
8882
);
8983
let next_seq_send_on_a = ctx_a.get_next_sequence_send(&seq_send_path_on_a)?;
9084

@@ -107,19 +101,15 @@ pub fn send_packet_execute(
107101
) -> Result<(), ChannelError> {
108102
let payload = &packet.payloads[0];
109103

110-
let (source_prefix, _source_port) = &payload.header.source_port;
111104
let channel_target_client_on_source = &packet.header.target_client_on_source;
112-
let (target_prefix, _target_port) = &payload.header.target_port;
113105
let channel_source_client_on_target = &packet.header.source_client_on_target;
114106
let seq_on_a = &packet.header.seq_on_a;
115107
let data = &payload.data;
116108

117109
{
118110
let seq_send_path_on_a = SeqSendPath::new(
119111
channel_source_client_on_target.as_ref(),
120-
&format!("{source_prefix:?}"),
121112
channel_target_client_on_source.as_ref(),
122-
&format!("{target_prefix:?}"),
123113
);
124114
let next_seq_send_on_a = ctx_a.get_next_sequence_send(&seq_send_path_on_a)?;
125115

@@ -129,9 +119,7 @@ pub fn send_packet_execute(
129119
ctx_a.store_packet_commitment(
130120
&CommitmentPath::new(
131121
channel_source_client_on_target.as_ref(),
132-
&format!("{source_prefix:?}"),
133122
channel_target_client_on_source.as_ref(),
134-
&format!("{target_prefix:?}"),
135123
seq_on_a,
136124
),
137125
compute_packet_commitment(

‎ibc-eureka-core/ics04-channel/src/handler/timeout.rs‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ where
3737
{
3838
let (packet, signer) = (msg.packet, msg.signer);
3939

40-
let payload = &packet.payloads[0];
41-
42-
let (source_prefix, _source_port) = &payload.header.source_port;
4340
let channel_target_client_on_source = &packet.header.target_client_on_source;
44-
let (target_prefix, _target_port) = &payload.header.target_port;
4541
let channel_source_client_on_target = &packet.header.source_client_on_target;
4642
let seq_on_a = &packet.header.seq_on_a;
4743

@@ -52,9 +48,7 @@ where
5248

5349
let commitment_path_on_a = CommitmentPath::new(
5450
channel_source_client_on_target.as_ref(),
55-
&format!("{source_prefix:?}"),
5651
channel_target_client_on_source.as_ref(),
57-
&format!("{target_prefix:?}"),
5852
seq_on_a,
5953
);
6054

@@ -96,19 +90,15 @@ where
9690
let packet = &msg.packet;
9791
let payload = &packet.payloads[0];
9892

99-
let (source_prefix, _source_port) = &payload.header.source_port;
10093
let channel_target_client_on_source = &packet.header.target_client_on_source;
101-
let (target_prefix, _target_port) = &payload.header.target_port;
10294
let channel_source_client_on_target = &packet.header.source_client_on_target;
10395
let seq_on_a = &packet.header.seq_on_a;
10496
let data = &payload.data;
10597

10698
//verify packet commitment
10799
let commitment_path_on_a = CommitmentPath::new(
108100
channel_source_client_on_target.as_ref(),
109-
&format!("{source_prefix:?}"),
110101
channel_target_client_on_source.as_ref(),
111-
&format!("{target_prefix:?}"),
112102
seq_on_a,
113103
);
114104
let Ok(commitment_on_a) = ctx_a.get_packet_commitment(&commitment_path_on_a) else {
@@ -169,14 +159,12 @@ where
169159
let next_seq_recv_verification_result = {
170160
let receipt_path_on_b = ReceiptPath::new(
171161
channel_source_client_on_target.as_ref(),
172-
&format!("{source_prefix:?}"),
173162
channel_target_client_on_source.as_ref(),
174-
&format!("{target_prefix:?}"),
175163
seq_on_a,
176164
);
177165

178166
target_client_on_source.verify_non_membership(
179-
target_prefix,
167+
&target_prefix,
180168
&msg.proof_unreceived_on_b,
181169
consensus_state_of_b_on_a.root(),
182170
Path::ReceiptV2(receipt_path_on_b),

0 commit comments

Comments
 (0)