gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 09:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Beta compiler fixes (#5916)

Browse Source 
* remove or update unused cfg
This commit is contained in:
realbigsean
2024-06-12 21:32:05 -04:00
committed by GitHub
parent f1d88ba4b1
commit c24b2f39b3
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/logging/src/async_record.rs
View File

@@ -123,12 +123,10 @@ impl Serializer for ToSendSerializer {
take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val)))); take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
Ok(()) Ok(())
} }
#[cfg(integer128)]
fn emit_u128(&mut self, key: Key, val: u128) -> slog::Result { fn emit_u128(&mut self, key: Key, val: u128) -> slog::Result {
take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val)))); take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
Ok(()) Ok(())
} }
#[cfg(integer128)]
fn emit_i128(&mut self, key: Key, val: i128) -> slog::Result { fn emit_i128(&mut self, key: Key, val: i128) -> slog::Result {
take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val)))); take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
Ok(()) Ok(())

2
common/validator_dir/src/validator_dir.rs
View File

@@ -39,8 +39,6 @@ pub enum Error {
/// generally caused by supplying an `amount` at deposit-time that is different to the one used /// generally caused by supplying an `amount` at deposit-time that is different to the one used
/// at generation-time. /// at generation-time.
Eth1DepositRootMismatch, Eth1DepositRootMismatch,
#[cfg(feature = "unencrypted_keys")]
SszKeypairError(String),
} }
/// Information required to submit a deposit to the Eth1 deposit contract. /// Information required to submit a deposit to the Eth1 deposit contract.

10
validator_client/slashing_protection/src/interchange.rs
View File

@@ -7,7 +7,7 @@ use types::{Epoch, Hash256, PublicKeyBytes, Slot};
#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)] #[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
#[serde(deny_unknown_fields)] #[serde(deny_unknown_fields)]
#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] #[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))]
pub struct InterchangeMetadata { pub struct InterchangeMetadata {
#[serde(with = "serde_utils::quoted_u64::require_quotes")] #[serde(with = "serde_utils::quoted_u64::require_quotes")]
pub interchange_format_version: u64, pub interchange_format_version: u64,
@@ -16,7 +16,7 @@ pub struct InterchangeMetadata {
#[derive(Debug, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)] #[derive(Debug, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
#[serde(deny_unknown_fields)] #[serde(deny_unknown_fields)]
#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] #[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))]
pub struct InterchangeData { pub struct InterchangeData {
pub pubkey: PublicKeyBytes, pub pubkey: PublicKeyBytes,
pub signed_blocks: Vec<SignedBlock>, pub signed_blocks: Vec<SignedBlock>,
@@ -25,7 +25,7 @@ pub struct InterchangeData {
#[derive(Debug, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)] #[derive(Debug, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
#[serde(deny_unknown_fields)] #[serde(deny_unknown_fields)]
#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] #[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))]
pub struct SignedBlock { pub struct SignedBlock {
#[serde(with = "serde_utils::quoted_u64::require_quotes")] #[serde(with = "serde_utils::quoted_u64::require_quotes")]
pub slot: Slot, pub slot: Slot,
@@ -35,7 +35,7 @@ pub struct SignedBlock {
#[derive(Debug, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)] #[derive(Debug, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
#[serde(deny_unknown_fields)] #[serde(deny_unknown_fields)]
#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] #[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))]
pub struct SignedAttestation { pub struct SignedAttestation {
#[serde(with = "serde_utils::quoted_u64::require_quotes")] #[serde(with = "serde_utils::quoted_u64::require_quotes")]
pub source_epoch: Epoch, pub source_epoch: Epoch,
@@ -46,7 +46,7 @@ pub struct SignedAttestation {
} }
#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)] #[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] #[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))]
pub struct Interchange { pub struct Interchange {
pub metadata: InterchangeMetadata, pub metadata: InterchangeMetadata,
pub data: Vec<InterchangeData>, pub data: Vec<InterchangeData>,

8
validator_client/slashing_protection/src/interchange_test.rs
View File

@@ -9,7 +9,7 @@ use tempfile::tempdir;
use types::{Epoch, Hash256, PublicKeyBytes, Slot}; use types::{Epoch, Hash256, PublicKeyBytes, Slot};
#[derive(Debug, Clone, Deserialize, Serialize)] #[derive(Debug, Clone, Deserialize, Serialize)]
#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] #[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))]
pub struct MultiTestCase { pub struct MultiTestCase {
pub name: String, pub name: String,
pub genesis_validators_root: Hash256, pub genesis_validators_root: Hash256,
@@ -17,7 +17,7 @@ pub struct MultiTestCase {
} }
#[derive(Debug, Clone, Deserialize, Serialize)] #[derive(Debug, Clone, Deserialize, Serialize)]
#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] #[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))]
pub struct TestCase { pub struct TestCase {
pub should_succeed: bool, pub should_succeed: bool,
pub contains_slashable_data: bool, pub contains_slashable_data: bool,
@@ -27,7 +27,7 @@ pub struct TestCase {
} }
#[derive(Debug, Clone, Deserialize, Serialize)] #[derive(Debug, Clone, Deserialize, Serialize)]
#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] #[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))]
pub struct TestBlock { pub struct TestBlock {
pub pubkey: PublicKeyBytes, pub pubkey: PublicKeyBytes,
pub slot: Slot, pub slot: Slot,
@@ -37,7 +37,7 @@ pub struct TestBlock {
} }
#[derive(Debug, Clone, Deserialize, Serialize)] #[derive(Debug, Clone, Deserialize, Serialize)]
#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] #[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))]
pub struct TestAttestation { pub struct TestAttestation {
pub pubkey: PublicKeyBytes, pub pubkey: PublicKeyBytes,
pub source_epoch: Epoch, pub source_epoch: Epoch,