Skip to content

Commit 0700514

Browse files
eserileveserilev
committed
Remove arc and pass by ref
1 parent 2b6d068 commit 0700514

File tree

13 files changed

+48
-49
lines changed

13 files changed

+48
-49
lines changed

‎beacon_node/beacon_chain/src/block_verification_types.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ impl<E: EthSpec> RpcBlock<E> {
9797
pub fn new<T>(
9898
block: Arc<SignedBeaconBlock<E>>,
9999
block_data: Option<AvailableBlockData<E>>,
100-
da_checker: Arc<DataAvailabilityChecker<T>>,
100+
da_checker: &DataAvailabilityChecker<T>,
101101
spec: Arc<ChainSpec>,
102102
) -> Result<Self, AvailabilityCheckError>
103103
where

‎beacon_node/beacon_chain/src/data_availability_checker.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -780,8 +780,7 @@ impl<E: EthSpec> AvailableBlock<E> {
780780
pub fn new<T>(
781781
block: Arc<SignedBeaconBlock<T::EthSpec>>,
782782
block_data: AvailableBlockData<T::EthSpec>,
783-
// TODO(pass as a reference)
784-
da_checker: Arc<DataAvailabilityChecker<T>>,
783+
da_checker: &DataAvailabilityChecker<T>,
785784
spec: Arc<ChainSpec>,
786785
) -> Result<Self, AvailabilityCheckError>
787786
where
@@ -1151,7 +1150,7 @@ mod test {
11511150

11521151
let block_data = AvailableBlockData::new_with_data_columns(custody_columns);
11531152
let da_checker = Arc::new(new_da_checker(spec.clone()));
1154-
RpcBlock::new(Arc::new(block), Some(block_data), da_checker, spec.clone())
1153+
RpcBlock::new(Arc::new(block), Some(block_data), &da_checker, spec.clone())
11551154
.expect("should create RPC block with custody columns")
11561155
})
11571156
.collect::<Vec<_>>();

‎beacon_node/beacon_chain/src/test_utils.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2482,7 +2482,7 @@ where
24822482
return RpcBlock::new(
24832483
block,
24842484
Some(AvailableBlockData::NoData),
2485-
self.chain.data_availability_checker.clone(),
2485+
&self.chain.data_availability_checker,
24862486
self.chain.spec.clone(),
24872487
)
24882488
.unwrap();
@@ -2496,7 +2496,7 @@ where
24962496
RpcBlock::new(
24972497
block,
24982498
Some(block_data),
2499-
self.chain.data_availability_checker.clone(),
2499+
&self.chain.data_availability_checker,
25002500
self.chain.spec.clone(),
25012501
)
25022502
.unwrap()
@@ -2511,7 +2511,7 @@ where
25112511
RpcBlock::new(
25122512
block,
25132513
Some(block_data),
2514-
self.chain.data_availability_checker.clone(),
2514+
&self.chain.data_availability_checker,
25152515
self.chain.spec.clone(),
25162516
)
25172517
.unwrap()
@@ -2542,29 +2542,29 @@ where
25422542
RpcBlock::new(
25432543
block,
25442544
Some(block_data),
2545-
self.chain.data_availability_checker.clone(),
2545+
&self.chain.data_availability_checker,
25462546
self.chain.spec.clone(),
25472547
)?
25482548
} else {
25492549
RpcBlock::new(
25502550
block,
25512551
None,
2552-
self.chain.data_availability_checker.clone(),
2552+
&self.chain.data_availability_checker,
25532553
self.chain.spec.clone(),
25542554
)?
25552555
}
25562556
} else if is_available {
25572557
RpcBlock::new(
25582558
block,
25592559
Some(AvailableBlockData::NoData),
2560-
self.chain.data_availability_checker.clone(),
2560+
&self.chain.data_availability_checker,
25612561
self.chain.spec.clone(),
25622562
)?
25632563
} else {
25642564
RpcBlock::new(
25652565
block,
25662566
None,
2567-
self.chain.data_availability_checker.clone(),
2567+
&self.chain.data_availability_checker,
25682568
self.chain.spec.clone(),
25692569
)?
25702570
}
@@ -2585,14 +2585,14 @@ where
25852585
RpcBlock::new(
25862586
block,
25872587
Some(block_data),
2588-
self.chain.data_availability_checker.clone(),
2588+
&self.chain.data_availability_checker,
25892589
self.chain.spec.clone(),
25902590
)?
25912591
} else {
25922592
RpcBlock::new(
25932593
block,
25942594
None,
2595-
self.chain.data_availability_checker.clone(),
2595+
&self.chain.data_availability_checker,
25962596
self.chain.spec.clone(),
25972597
)?
25982598
}

‎beacon_node/beacon_chain/tests/block_verification.rs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ where
163163
RpcBlock::new(
164164
block,
165165
Some(block_data),
166-
chain.data_availability_checker.clone(),
166+
&chain.data_availability_checker,
167167
chain.spec.clone(),
168168
)
169169
.unwrap()
@@ -178,15 +178,15 @@ where
178178
RpcBlock::new(
179179
block,
180180
Some(block_data),
181-
chain.data_availability_checker.clone(),
181+
&chain.data_availability_checker,
182182
chain.spec.clone(),
183183
)
184184
.unwrap()
185185
}
186186
None => RpcBlock::new(
187187
block,
188188
Some(AvailableBlockData::NoData),
189-
chain.data_availability_checker.clone(),
189+
&chain.data_availability_checker,
190190
chain.spec.clone(),
191191
)
192192
.unwrap(),
@@ -415,7 +415,7 @@ async fn chain_segment_non_linear_parent_roots() {
415415
blocks[3] = RpcBlock::new(
416416
Arc::new(SignedBeaconBlock::from_block(block, signature)),
417417
blocks[3].block_data().cloned(),
418-
harness.chain.data_availability_checker.clone(),
418+
&harness.chain.data_availability_checker,
419419
harness.spec.clone(),
420420
)
421421
.unwrap();
@@ -455,7 +455,7 @@ async fn chain_segment_non_linear_slots() {
455455
blocks[3] = RpcBlock::new(
456456
Arc::new(SignedBeaconBlock::from_block(block, signature)),
457457
blocks[3].block_data().cloned(),
458-
harness.chain.data_availability_checker.clone(),
458+
&harness.chain.data_availability_checker,
459459
harness.spec.clone(),
460460
)
461461
.unwrap();
@@ -485,7 +485,7 @@ async fn chain_segment_non_linear_slots() {
485485
blocks[3] = RpcBlock::new(
486486
Arc::new(SignedBeaconBlock::from_block(block, signature)),
487487
blocks[3].block_data().cloned(),
488-
harness.chain.data_availability_checker.clone(),
488+
&harness.chain.data_availability_checker,
489489
harness.chain.spec.clone(),
490490
)
491491
.unwrap();
@@ -632,7 +632,7 @@ async fn invalid_signature_gossip_block() {
632632
let rpc_block = RpcBlock::new(
633633
Arc::new(signed_block),
634634
None,
635-
harness.chain.data_availability_checker.clone(),
635+
&harness.chain.data_availability_checker,
636636
harness.spec.clone(),
637637
)
638638
.unwrap();
@@ -1643,7 +1643,7 @@ async fn add_base_block_to_altair_chain() {
16431643
let base_rpc_block = RpcBlock::new(
16441644
Arc::new(base_block.clone()),
16451645
None,
1646-
harness.chain.data_availability_checker.clone(),
1646+
&harness.chain.data_availability_checker,
16471647
harness.spec.clone(),
16481648
)
16491649
.unwrap();
@@ -1674,7 +1674,7 @@ async fn add_base_block_to_altair_chain() {
16741674
RpcBlock::new(
16751675
Arc::new(base_block),
16761676
None,
1677-
harness.chain.data_availability_checker.clone(),
1677+
&harness.chain.data_availability_checker,
16781678
harness.spec.clone()
16791679
)
16801680
.unwrap()
@@ -1794,7 +1794,7 @@ async fn add_altair_block_to_base_chain() {
17941794
let altair_rpc_block = RpcBlock::new(
17951795
Arc::new(altair_block.clone()),
17961796
None,
1797-
harness.chain.data_availability_checker.clone(),
1797+
&harness.chain.data_availability_checker,
17981798
harness.spec.clone(),
17991799
)
18001800
.unwrap();
@@ -1825,7 +1825,7 @@ async fn add_altair_block_to_base_chain() {
18251825
RpcBlock::new(
18261826
Arc::new(altair_block),
18271827
None,
1828-
harness.chain.data_availability_checker.clone(),
1828+
&harness.chain.data_availability_checker,
18291829
harness.spec.clone()
18301830
)
18311831
.unwrap()
@@ -1895,7 +1895,7 @@ async fn import_duplicate_block_unrealized_justification() {
18951895
let rpc_block = RpcBlock::new(
18961896
block.clone(),
18971897
Some(AvailableBlockData::NoData),
1898-
harness.chain.data_availability_checker.clone(),
1898+
&harness.chain.data_availability_checker,
18991899
harness.spec.clone(),
19001900
)
19011901
.unwrap();
@@ -1998,7 +1998,7 @@ async fn signature_verify_mixed_rpc_block_variants() {
19981998
RpcBlock::new(
19991999
block,
20002000
None,
2001-
harness.chain.data_availability_checker.clone(),
2001+
&harness.chain.data_availability_checker,
20022002
harness.chain.spec.clone(),
20032003
)
20042004
.unwrap()
@@ -2068,7 +2068,7 @@ async fn rpc_block_construction_fails_with_wrong_blob_count() {
20682068
let result = RpcBlock::new(
20692069
Arc::new(block),
20702070
Some(block_data),
2071-
harness.chain.data_availability_checker.clone(),
2071+
&harness.chain.data_availability_checker,
20722072
harness.chain.spec.clone(),
20732073
);
20742074

@@ -2138,7 +2138,7 @@ async fn rpc_block_rejects_missing_custody_columns() {
21382138
let result = RpcBlock::new(
21392139
Arc::new(block),
21402140
Some(block_data),
2141-
harness.chain.data_availability_checker.clone(),
2141+
&harness.chain.data_availability_checker,
21422142
harness.chain.spec.clone(),
21432143
);
21442144

@@ -2226,7 +2226,7 @@ async fn rpc_block_allows_construction_past_da_boundary() {
22262226
let result = RpcBlock::new(
22272227
Arc::new(block),
22282228
Some(AvailableBlockData::NoData),
2229-
harness.chain.data_availability_checker.clone(),
2229+
&harness.chain.data_availability_checker,
22302230
harness.chain.spec.clone(),
22312231
);
22322232

‎beacon_node/beacon_chain/tests/payload_invalidation.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ async fn invalidates_all_descendants() {
688688
let fork_rpc_block = RpcBlock::new(
689689
fork_block.clone(),
690690
None,
691-
rig.harness.chain.data_availability_checker.clone(),
691+
&rig.harness.chain.data_availability_checker,
692692
rig.harness.chain.spec.clone(),
693693
)
694694
.unwrap();
@@ -796,7 +796,7 @@ async fn switches_heads() {
796796
let fork_rpc_block = RpcBlock::new(
797797
fork_block.clone(),
798798
None,
799-
rig.harness.chain.data_availability_checker.clone(),
799+
&rig.harness.chain.data_availability_checker,
800800
rig.harness.chain.spec.clone(),
801801
)
802802
.unwrap();
@@ -1074,7 +1074,7 @@ async fn invalid_parent() {
10741074
let rpc_block = RpcBlock::new(
10751075
block.clone(),
10761076
None,
1077-
rig.harness.chain.data_availability_checker.clone(),
1077+
&rig.harness.chain.data_availability_checker,
10781078
rig.harness.chain.spec.clone(),
10791079
)
10801080
.unwrap();
@@ -1405,7 +1405,7 @@ async fn recover_from_invalid_head_by_importing_blocks() {
14051405
let fork_rpc_block = RpcBlock::new(
14061406
fork_block.clone(),
14071407
None,
1408-
rig.harness.chain.data_availability_checker.clone(),
1408+
&rig.harness.chain.data_availability_checker,
14091409
rig.harness.chain.spec.clone(),
14101410
)
14111411
.unwrap();

‎beacon_node/beacon_chain/tests/store_tests.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3201,7 +3201,7 @@ async fn weak_subjectivity_sync_test(
32013201
AvailableBlock::new(
32023202
Arc::new(corrupt_block),
32033203
data,
3204-
beacon_chain.data_availability_checker.clone(),
3204+
&beacon_chain.data_availability_checker,
32053205
Arc::new(spec),
32063206
)
32073207
.expect("available block")
@@ -3708,7 +3708,7 @@ async fn process_blocks_and_attestations_for_unaligned_checkpoint() {
37083708
let invalid_fork_rpc_block = RpcBlock::new(
37093709
invalid_fork_block.clone(),
37103710
None,
3711-
harness.chain.data_availability_checker.clone(),
3711+
&harness.chain.data_availability_checker,
37123712
harness.spec.clone(),
37133713
)
37143714
.unwrap();
@@ -3730,7 +3730,7 @@ async fn process_blocks_and_attestations_for_unaligned_checkpoint() {
37303730
let valid_fork_rpc_block = RpcBlock::new(
37313731
valid_fork_block.clone(),
37323732
None,
3733-
harness.chain.data_availability_checker.clone(),
3733+
&harness.chain.data_availability_checker,
37343734
harness.spec.clone(),
37353735
)
37363736
.unwrap();

‎beacon_node/http_api/src/publish_blocks.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ pub async fn publish_block<T: BeaconChainTypes, B: IntoGossipVerifiedBlock<T>>(
318318
let Ok(rpc_block) = RpcBlock::new(
319319
block.clone(),
320320
None,
321-
chain.data_availability_checker.clone(),
321+
&chain.data_availability_checker,
322322
chain.spec.clone(),
323323
) else {
324324
return Err(warp_utils::reject::custom_bad_request(

‎beacon_node/network/src/network_beacon_processor/tests.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ impl TestRig {
402402
RpcBlock::new(
403403
self.next_block.clone(),
404404
None,
405-
self._harness.chain.data_availability_checker.clone(),
405+
&self._harness.chain.data_availability_checker,
406406
self._harness.spec.clone(),
407407
)
408408
.unwrap(),
@@ -420,7 +420,7 @@ impl TestRig {
420420
RpcBlock::new(
421421
self.next_block.clone(),
422422
None,
423-
self._harness.chain.data_availability_checker.clone(),
423+
&self._harness.chain.data_availability_checker,
424424
self._harness.spec.clone(),
425425
)
426426
.unwrap(),

‎beacon_node/network/src/sync/block_sidecar_coupling.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ impl<E: EthSpec> RangeBlockComponentsRequest<E> {
335335
})?;
336336
let block_data = AvailableBlockData::new_with_blobs(blobs);
337337
responses.push(
338-
RpcBlock::new(block, Some(block_data), da_checker.clone(), spec.clone())
338+
RpcBlock::new(block, Some(block_data), &da_checker, spec.clone())
339339
.map_err(|e| CouplingError::BlobPeerFailure(format!("{e:?}")))?,
340340
)
341341
}
@@ -441,11 +441,11 @@ impl<E: EthSpec> RangeBlockComponentsRequest<E> {
441441

442442
let block_data = AvailableBlockData::new_with_data_columns(custody_columns.iter().map(|c| c.as_data_column().clone()).collect::<Vec<_>>());
443443

444-
RpcBlock::new(block, Some(block_data), da_checker.clone(), spec.clone())
444+
RpcBlock::new(block, Some(block_data), &da_checker, spec.clone())
445445
.map_err(|e| CouplingError::InternalError(format!("{:?}", e)))?
446446
} else {
447447
// Block has no data, expects zero columns
448-
RpcBlock::new(block, Some(AvailableBlockData::NoData), da_checker.clone(), spec.clone())
448+
RpcBlock::new(block, Some(AvailableBlockData::NoData), &da_checker, spec.clone())
449449
.map_err(|e| CouplingError::InternalError(format!("{:?}", e)))?
450450
});
451451
}

‎beacon_node/network/src/sync/network_context.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1612,7 +1612,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
16121612
let block = RpcBlock::new(
16131613
block,
16141614
None,
1615-
self.chain.data_availability_checker.clone(),
1615+
&self.chain.data_availability_checker,
16161616
self.chain.spec.clone(),
16171617
)
16181618
.map_err(|_| SendErrorProcessor::SendError)?;

0 commit comments

Comments
 (0)