Skip to content

Commit 620ca10

Browse files
committed
Fix warnings
1 parent 04d37fd commit 620ca10

File tree

4 files changed

+12
-29
lines changed

4 files changed

+12
-29
lines changed

beacon_node/execution_layer/src/engine_api/json_structures.rs

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use super::*;
22
use alloy_rlp::RlpEncodable;
3-
use bytes::{BufMut, Bytes, BytesMut};
3+
use bytes::Bytes;
44
use serde::{Deserialize, Serialize};
5-
use ssz::{Decode, Encode};
5+
use ssz::Decode;
66
use strum::EnumString;
77
use superstruct::superstruct;
88
use types::beacon_block_body::KzgCommitments;
99
use types::blob_sidecar::BlobsList;
10-
use types::{DepositRequest, FixedVector, PublicKeyBytes, Signature, Unsigned, WithdrawalRequest};
10+
use types::{DepositRequest, FixedVector, Unsigned, WithdrawalRequest};
1111

1212
#[derive(Debug, PartialEq, Serialize, Deserialize)]
1313
#[serde(rename_all = "camelCase")]
@@ -191,15 +191,6 @@ enum RequestPrefix {
191191
}
192192

193193
impl RequestPrefix {
194-
// TODO(pawan): get the final values from the spec
195-
pub fn to_prefix(&self) -> u8 {
196-
match self {
197-
Self::Deposit => 0,
198-
Self::Withdrawal => 1,
199-
Self::Consolidation => 2,
200-
}
201-
}
202-
203194
pub fn from_prefix(prefix: u8) -> Option<Self> {
204195
match prefix {
205196
0 => Some(Self::Deposit),
@@ -210,13 +201,6 @@ impl RequestPrefix {
210201
}
211202
}
212203

213-
fn prefix_and_bytes<T: Encode>(request: &T, prefix: u8, max_size: usize) -> Bytes {
214-
let mut bytes: Vec<u8> = Vec::with_capacity(max_size);
215-
bytes.push(prefix);
216-
bytes.append(&mut request.as_ssz_bytes());
217-
Bytes::from(bytes)
218-
}
219-
220204
impl<E: EthSpec> From<ExecutionPayloadElectra<E>> for JsonExecutionPayloadV4<E> {
221205
fn from(payload: ExecutionPayloadElectra<E>) -> Self {
222206
JsonExecutionPayloadV4 {
@@ -828,12 +812,7 @@ impl<E: EthSpec> From<ExecutionPayloadBodyV1<E>> for JsonExecutionPayloadBodyV1<
828812
Self {
829813
transactions: value.transactions,
830814
withdrawals: value.withdrawals.map(|withdrawals| {
831-
VariableList::from(
832-
withdrawals
833-
.into_iter()
834-
.map(Into::into)
835-
.collect::<Vec<_>>(),
836-
)
815+
VariableList::from(withdrawals.into_iter().map(Into::into).collect::<Vec<_>>())
837816
}),
838817
}
839818
}

beacon_node/execution_layer/src/test_utils/handle_rpc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ pub async fn handle_rpc<E: EthSpec>(
247247
Some(
248248
ctx.execution_block_generator
249249
.write()
250-
.new_payload(request.try_into().unwrap()),
250+
.new_payload(request.into()),
251251
)
252252
} else {
253253
None

beacon_node/execution_layer/src/test_utils/mock_builder.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,8 @@ pub fn serve<E: EthSpec>(
540540

541541
let mut message = match payload_response_type {
542542
crate::GetPayloadResponseType::Full(payload_response) => {
543-
let (payload, _block_value, maybe_blobs_bundle, maybe_requests): (
543+
#[allow(clippy::type_complexity)]
544+
let (payload, _block_value, maybe_blobs_bundle, _maybe_requests): (
544545
ExecutionPayload<E>,
545546
Uint256,
546547
Option<BlobsBundle<E>>,
@@ -592,7 +593,8 @@ pub fn serve<E: EthSpec>(
592593
}
593594
}
594595
crate::GetPayloadResponseType::Blinded(payload_response) => {
595-
let (payload, _block_value, maybe_blobs_bundle, maybe_requests): (
596+
#[allow(clippy::type_complexity)]
597+
let (payload, _block_value, maybe_blobs_bundle, _maybe_requests): (
596598
ExecutionPayload<E>,
597599
Uint256,
598600
Option<BlobsBundle<E>>,

consensus/types/src/execution_requests.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ pub struct ExecutionRequests<E: EthSpec> {
3838

3939
#[cfg(test)]
4040
mod tests {
41+
use crate::MainnetEthSpec;
42+
4143
use super::*;
4244

43-
ssz_and_tree_hash_tests!(ExecutionRequests);
45+
ssz_and_tree_hash_tests!(ExecutionRequests<MainnetEthSpec>);
4446
}

0 commit comments

Comments
 (0)