Skip to content

Commit ee5bb1d

Browse files
azarovhazarovh
committed
Rename TestNode::message
1 parent 2451247 commit ee5bb1d

File tree

8 files changed

+55
-64
lines changed

8 files changed

+55
-64
lines changed

‎p2p/src/sync/tests/ban_scores.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ async fn receive_header_with_invalid_parent_block(#[case] seed: Seed) {
138138
])))
139139
.await;
140140

141-
let (adjusted_peer_id, ban_score_delta) = node.adjust_peer_score_event().await;
141+
let (adjusted_peer_id, ban_score_delta) = node.receive_adjust_peer_score_event().await;
142142
assert_eq!(adjusted_peer_id, peer.get_id());
143143
assert_eq!(ban_score_delta, 100);
144144

‎p2p/src/sync/tests/block_announcement.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ async fn single_header_with_unknown_prev_block_v1(#[case] seed: Seed) {
106106
// that the event is caught even if it's late; the first one just allows the test to fail
107107
// faster if the event is not late.
108108
node.assert_no_peer_manager_event().await;
109-
let (sent_to, message) = node.message().await;
109+
let (sent_to, message) = node.get_sent_message().await;
110110
assert_eq!(sent_to, peer.get_id());
111111
assert!(matches!(message, SyncMessage::HeaderListRequest(_)));
112112
node.assert_no_peer_manager_event().await;
@@ -191,7 +191,7 @@ async fn single_header_with_unknown_prev_block_with_intermittent_connected_heade
191191
peer.send_headers(vec![block_2.header().clone()]).await;
192192

193193
node.assert_no_peer_manager_event().await;
194-
let (sent_to, message) = node.message().await;
194+
let (sent_to, message) = node.get_sent_message().await;
195195
assert_eq!(sent_to, peer.get_id());
196196
assert!(matches!(message, SyncMessage::HeaderListRequest(_)));
197197
node.assert_no_peer_manager_event().await;
@@ -200,7 +200,7 @@ async fn single_header_with_unknown_prev_block_with_intermittent_connected_heade
200200
peer.send_headers(vec![block_11.header().clone()]).await;
201201

202202
node.assert_no_peer_manager_event().await;
203-
let (sent_to, message) = node.message().await;
203+
let (sent_to, message) = node.get_sent_message().await;
204204
assert_eq!(sent_to, peer.get_id());
205205
assert!(matches!(message, SyncMessage::BlockListRequest(_)));
206206
node.assert_no_peer_manager_event().await;
@@ -211,7 +211,7 @@ async fn single_header_with_unknown_prev_block_with_intermittent_connected_heade
211211
peer.send_headers(vec![block_2.header().clone()]).await;
212212

213213
node.assert_no_peer_manager_event().await;
214-
let (sent_to, message) = node.message().await;
214+
let (sent_to, message) = node.get_sent_message().await;
215215
assert_eq!(sent_to, peer.get_id());
216216
assert!(matches!(message, SyncMessage::HeaderListRequest(_)));
217217
node.assert_no_peer_manager_event().await;
@@ -287,7 +287,7 @@ async fn invalid_timestamp() {
287287
.clone()])))
288288
.await;
289289

290-
let (adjusted_peer, score) = node.adjust_peer_score_event().await;
290+
let (adjusted_peer, score) = node.receive_adjust_peer_score_event().await;
291291
assert_eq!(peer.get_id(), adjusted_peer);
292292
assert_eq!(
293293
score,
@@ -337,7 +337,7 @@ async fn invalid_consensus_data() {
337337
.clone()])))
338338
.await;
339339

340-
let (adjusted_peer, score) = node.adjust_peer_score_event().await;
340+
let (adjusted_peer, score) = node.receive_adjust_peer_score_event().await;
341341
assert_eq!(peer.get_id(), adjusted_peer);
342342
assert_eq!(
343343
score,
@@ -429,7 +429,7 @@ async fn valid_block(#[case] seed: Seed) {
429429
.clone()])))
430430
.await;
431431

432-
let (sent_to, message) = node.message().await;
432+
let (sent_to, message) = node.get_sent_message().await;
433433
assert_eq!(sent_to, peer.get_id());
434434
assert_eq!(
435435
message,
@@ -484,7 +484,7 @@ async fn best_known_header_is_considered(#[case] seed: Seed) {
484484
.await;
485485

486486
log::debug!("Expecting initial header response");
487-
let (sent_to, message) = node.message().await;
487+
let (sent_to, message) = node.get_sent_message().await;
488488
assert_eq!(sent_to, peer.get_id());
489489
assert_eq!(
490490
message,
@@ -506,7 +506,7 @@ async fn best_known_header_is_considered(#[case] seed: Seed) {
506506
.await;
507507

508508
log::debug!("Expecting first announcement");
509-
let (sent_to, message) = node.message().await;
509+
let (sent_to, message) = node.get_sent_message().await;
510510
assert_eq!(sent_to, peer.get_id());
511511
assert_eq!(
512512
message,
@@ -534,7 +534,7 @@ async fn best_known_header_is_considered(#[case] seed: Seed) {
534534
.await;
535535

536536
log::debug!("Expecting second announcement");
537-
let (sent_to, message) = node.message().await;
537+
let (sent_to, message) = node.get_sent_message().await;
538538
assert_eq!(sent_to, peer.get_id());
539539
assert_eq!(
540540
message,
@@ -558,7 +558,7 @@ async fn best_known_header_is_considered(#[case] seed: Seed) {
558558
.await;
559559

560560
log::debug!("Expecting third announcement");
561-
let (sent_to, message) = node.message().await;
561+
let (sent_to, message) = node.get_sent_message().await;
562562
assert_eq!(sent_to, peer.get_id());
563563
assert_eq!(
564564
message,

‎p2p/src/sync/tests/block_list_request.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ async fn max_block_count_in_request_exceeded(#[case] seed: Seed) {
6767
peer.send_message(SyncMessage::BlockListRequest(BlockListRequest::new(blocks)))
6868
.await;
6969

70-
let (adjusted_peer, score) = node.adjust_peer_score_event().await;
70+
let (adjusted_peer, score) = node.receive_adjust_peer_score_event().await;
7171
assert_eq!(peer.get_id(), adjusted_peer);
7272
assert_eq!(
7373
score,
@@ -114,7 +114,7 @@ async fn unknown_blocks(#[case] seed: Seed) {
114114
)))
115115
.await;
116116

117-
let (adjusted_peer, score) = node.adjust_peer_score_event().await;
117+
let (adjusted_peer, score) = node.receive_adjust_peer_score_event().await;
118118
assert_eq!(peer.get_id(), adjusted_peer);
119119
assert_eq!(score, expected_score);
120120
node.assert_no_event().await;
@@ -157,7 +157,7 @@ async fn valid_request(#[case] seed: Seed) {
157157
.await;
158158

159159
for block in blocks {
160-
let (sent_to, message) = node.message().await;
160+
let (sent_to, message) = node.get_sent_message().await;
161161
assert_eq!(peer.get_id(), sent_to);
162162
assert_eq!(
163163
message,
@@ -205,7 +205,7 @@ async fn request_same_block_twice(#[case] seed: Seed) {
205205
])))
206206
.await;
207207

208-
let (sent_to, message) = node.message().await;
208+
let (sent_to, message) = node.get_sent_message().await;
209209
assert_eq!(peer.get_id(), sent_to);
210210
assert_eq!(
211211
message,
@@ -221,7 +221,7 @@ async fn request_same_block_twice(#[case] seed: Seed) {
221221
])))
222222
.await;
223223

224-
let (adjusted_peer, score) = node.adjust_peer_score_event().await;
224+
let (adjusted_peer, score) = node.receive_adjust_peer_score_event().await;
225225
assert_eq!(peer.get_id(), adjusted_peer);
226226
assert_eq!(
227227
score,

‎p2p/src/sync/tests/block_response.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ async fn unrequested_block(#[case] seed: Seed) {
6060

6161
peer.send_message(SyncMessage::BlockResponse(BlockResponse::new(block))).await;
6262

63-
let (adjusted_peer, score) = node.adjust_peer_score_event().await;
63+
let (adjusted_peer, score) = node.receive_adjust_peer_score_event().await;
6464
assert_eq!(peer.get_id(), adjusted_peer);
6565
assert_eq!(
6666
score,
@@ -100,7 +100,7 @@ async fn valid_response(#[case] seed: Seed) {
100100
let headers = blocks.iter().map(|b| b.header().clone()).collect();
101101
peer.send_message(SyncMessage::HeaderList(HeaderList::new(headers))).await;
102102

103-
let (sent_to, message) = node.message().await;
103+
let (sent_to, message) = node.get_sent_message().await;
104104
assert_eq!(peer.get_id(), sent_to);
105105
let ids = blocks.iter().map(|b| b.get_id()).collect();
106106
assert_eq!(
@@ -117,7 +117,7 @@ async fn valid_response(#[case] seed: Seed) {
117117

118118
// A peer would request headers after the last block.
119119
assert!(matches!(
120-
node.message().await.1,
120+
node.get_sent_message().await.1,
121121
SyncMessage::HeaderListRequest(HeaderListRequest { .. })
122122
));
123123

@@ -183,15 +183,15 @@ async fn disconnect(#[case] seed: Seed) {
183183
.clone()])))
184184
.await;
185185

186-
let (sent_to, message) = node.message().await;
186+
let (sent_to, message) = node.get_sent_message().await;
187187
assert_eq!(peer.get_id(), sent_to);
188188
assert_eq!(
189189
message,
190190
SyncMessage::BlockListRequest(BlockListRequest::new(vec![block.get_id()]))
191191
);
192192

193193
tokio::time::sleep(Duration::from_millis(300)).await;
194-
node.assert_disconnect_peer_event(peer.get_id()).await;
194+
node.receive_disconnect_peer_event(peer.get_id()).await;
195195

196196
node.join_subsystem_manager().await;
197197
})
@@ -262,7 +262,7 @@ async fn slow_response(#[case] seed: Seed) {
262262
.clone()])))
263263
.await;
264264

265-
let (sent_to, message) = node.message().await;
265+
let (sent_to, message) = node.get_sent_message().await;
266266
assert_eq!(peer.get_id(), sent_to);
267267
assert_eq!(
268268
message,
@@ -277,7 +277,7 @@ async fn slow_response(#[case] seed: Seed) {
277277
.await;
278278

279279
assert!(matches!(
280-
node.message().await.1,
280+
node.get_sent_message().await.1,
281281
SyncMessage::HeaderListRequest(HeaderListRequest { .. })
282282
));
283283

@@ -349,7 +349,7 @@ async fn invalidated_block(#[case] seed: Seed) {
349349
// The node sends HeaderList.
350350
let initial_blocks_headers = initial_blocks.iter().map(|b| b.header().clone()).collect();
351351
assert_eq!(
352-
node.message().await.1,
352+
node.get_sent_message().await.1,
353353
SyncMessage::HeaderList(HeaderList::new(initial_blocks_headers))
354354
);
355355

@@ -362,11 +362,11 @@ async fn invalidated_block(#[case] seed: Seed) {
362362

363363
// The node sends block responses.
364364
assert_eq!(
365-
node.message().await.1,
365+
node.get_sent_message().await.1,
366366
SyncMessage::BlockResponse(BlockResponse::new(initial_blocks[0].clone()))
367367
);
368368
assert_eq!(
369-
node.message().await.1,
369+
node.get_sent_message().await.1,
370370
SyncMessage::BlockResponse(BlockResponse::new(initial_blocks[1].clone()))
371371
);
372372

@@ -394,7 +394,7 @@ async fn invalidated_block(#[case] seed: Seed) {
394394

395395
// The node should send the new tip update
396396
assert_eq!(
397-
node.message().await.1,
397+
node.get_sent_message().await.1,
398398
SyncMessage::HeaderList(HeaderList::new(vec![new_header.clone()]))
399399
);
400400

‎p2p/src/sync/tests/header_list_request.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ async fn max_locator_size_exceeded(#[case] seed: Seed) {
6464
)))
6565
.await;
6666

67-
let (adjusted_peer, score) = node.adjust_peer_score_event().await;
67+
let (adjusted_peer, score) = node.receive_adjust_peer_score_event().await;
6868
assert_eq!(peer.get_id(), adjusted_peer);
6969
assert_eq!(
7070
score,
@@ -110,7 +110,7 @@ async fn valid_request(#[case] seed: Seed) {
110110
)))
111111
.await;
112112

113-
let (sent_to, message) = node.message().await;
113+
let (sent_to, message) = node.get_sent_message().await;
114114
assert_eq!(peer.get_id(), sent_to);
115115
let headers = match message {
116116
SyncMessage::HeaderList(l) => l.into_headers(),
@@ -201,7 +201,7 @@ async fn allow_peer_to_ignore_header_requests_when_asking_for_blocks(
201201

202202
// The node should send the header list.
203203
assert_eq!(
204-
node.message().await.1,
204+
node.get_sent_message().await.1,
205205
SyncMessage::HeaderList(HeaderList::new(headers)),
206206
);
207207

@@ -221,7 +221,7 @@ async fn allow_peer_to_ignore_header_requests_when_asking_for_blocks(
221221

222222
// The node should send the block.
223223
assert_eq!(
224-
node.message().await.1,
224+
node.get_sent_message().await.1,
225225
SyncMessage::BlockResponse(BlockResponse::new(block)),
226226
);
227227
}
@@ -293,7 +293,7 @@ async fn respond_with_empty_header_list_when_in_ibd(#[case] protocol_version: Pr
293293

294294
// The node should send an empty header list.
295295
assert_eq!(
296-
node.message().await.1,
296+
node.get_sent_message().await.1,
297297
SyncMessage::HeaderList(HeaderList::new(Vec::new())),
298298
);
299299

‎p2p/src/sync/tests/header_list_response.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ async fn header_count_limit_exceeded(#[case] seed: Seed) {
6060
.collect();
6161
peer.send_message(SyncMessage::HeaderList(HeaderList::new(headers))).await;
6262

63-
let (adjusted_peer, score) = node.adjust_peer_score_event().await;
63+
let (adjusted_peer, score) = node.receive_adjust_peer_score_event().await;
6464
assert_eq!(peer.get_id(), adjusted_peer);
6565
assert_eq!(
6666
score,
@@ -104,7 +104,7 @@ async fn unordered_headers(#[case] seed: Seed) {
104104

105105
peer.send_message(SyncMessage::HeaderList(HeaderList::new(headers))).await;
106106

107-
let (adjusted_peer, score) = node.adjust_peer_score_event().await;
107+
let (adjusted_peer, score) = node.receive_adjust_peer_score_event().await;
108108
assert_eq!(peer.get_id(), adjusted_peer);
109109
assert_eq!(
110110
score,
@@ -146,7 +146,7 @@ async fn disconnected_headers(#[case] seed: Seed) {
146146

147147
peer.send_message(SyncMessage::HeaderList(HeaderList::new(headers))).await;
148148

149-
let (adjusted_peer, score) = node.adjust_peer_score_event().await;
149+
let (adjusted_peer, score) = node.receive_adjust_peer_score_event().await;
150150
assert_eq!(peer.get_id(), adjusted_peer);
151151
assert_eq!(
152152
score,
@@ -185,7 +185,7 @@ async fn valid_headers(#[case] seed: Seed) {
185185
let headers = blocks.iter().map(|b| b.header().clone()).collect();
186186
peer.send_message(SyncMessage::HeaderList(HeaderList::new(headers))).await;
187187

188-
let (sent_to, message) = node.message().await;
188+
let (sent_to, message) = node.get_sent_message().await;
189189
assert_eq!(peer.get_id(), sent_to);
190190
assert_eq!(
191191
message,
@@ -239,7 +239,7 @@ async fn disconnect() {
239239
let peer = node.connect_peer(PeerId::new(), protocol_version).await;
240240

241241
tokio::time::sleep(Duration::from_millis(300)).await;
242-
node.assert_disconnect_peer_event(peer.get_id()).await;
242+
node.receive_disconnect_peer_event(peer.get_id()).await;
243243

244244
node.join_subsystem_manager().await;
245245
})

0 commit comments

Comments
 (0)