Skip to content

fix: impl From ConsensusVersion for DataVersion #497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iamquang95 wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −34
Open

fix: impl From ConsensusVersion for DataVersion #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions crates/eth2api/src/spec/version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,23 +80,6 @@ impl DataVersion {
_ => Err(VersionError::UnknownDataVersion),
}
}

/// Maps to the equivalent beacon API
/// [`ConsensusVersion`](crate::ConsensusVersion).
// TODO: change to From<&ConsensusVersion> after PR #454
pub const fn to_consensus_version(self) -> Result<crate::ConsensusVersion, VersionError> {
use crate::ConsensusVersion;
match self {
DataVersion::Phase0 => Ok(ConsensusVersion::Phase0),
DataVersion::Altair => Ok(ConsensusVersion::Altair),
DataVersion::Bellatrix => Ok(ConsensusVersion::Bellatrix),
DataVersion::Capella => Ok(ConsensusVersion::Capella),
DataVersion::Deneb => Ok(ConsensusVersion::Deneb),
DataVersion::Electra => Ok(ConsensusVersion::Electra),
DataVersion::Fulu => Ok(ConsensusVersion::Fulu),
DataVersion::Unknown => Err(VersionError::UnknownDataVersion),
}
}
}

impl fmt::Display for DataVersion {
Expand All @@ -121,6 +104,25 @@ impl From<&ConsensusVersion> for DataVersion {
}
}

impl TryFrom<&DataVersion> for ConsensusVersion {
type Error = VersionError;

/// Maps a data version onto the equivalent beacon-node `ConsensusVersion`.
/// Fallible: `DataVersion::Unknown` has no consensus-version equivalent.
fn try_from(version: &DataVersion) -> Result<Self, Self::Error> {
match version {
DataVersion::Phase0 => Ok(ConsensusVersion::Phase0),
DataVersion::Altair => Ok(ConsensusVersion::Altair),
DataVersion::Bellatrix => Ok(ConsensusVersion::Bellatrix),
DataVersion::Capella => Ok(ConsensusVersion::Capella),
DataVersion::Deneb => Ok(ConsensusVersion::Deneb),
DataVersion::Electra => Ok(ConsensusVersion::Electra),
DataVersion::Fulu => Ok(ConsensusVersion::Fulu),
DataVersion::Unknown => Err(VersionError::UnknownDataVersion),
}
}
}

/// Builder API version.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default, Serialize, Deserialize)]
#[serde(rename_all = "lowercase")]
Expand Down Expand Up @@ -331,7 +333,7 @@ mod tests {
expected: Option<crate::ConsensusVersion>,
expected_err: Option<VersionError>,
) {
match (version.to_consensus_version(), expected, expected_err) {
match (ConsensusVersion::try_from(&version), expected, expected_err) {
(Ok(actual), Some(expected), None) => assert_eq!(actual, expected),
(Err(err), None, Some(expected_err)) => assert_eq!(err, expected_err),
_ => panic!("unexpected conversion result"),
Expand Down
27 changes: 11 additions & 16 deletions crates/eth2api/src/validator_duty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ impl EthBeaconNodeApiClient {
&self,
attestations: Vec<versioned::VersionedAttestation>,
) -> Result<()> {
let version = attestations
let data_version = attestations
.first()
.map(|attestation| attestation.version)
.unwrap_or(versioned::DataVersion::Phase0)
.to_consensus_version()
.map_err(error_message)?;
.unwrap_or(versioned::DataVersion::Phase0);
let version: crate::ConsensusVersion =
crate::ConsensusVersion::try_from(&data_version).map_err(error_message)?;
let body = attestations_request_body(attestations)?;
let request = crate::SubmitPoolAttestationsV2Request {
header: crate::SubmitPoolAttestationsV2RequestHeader {
Expand Down Expand Up @@ -127,10 +127,8 @@ impl EthBeaconNodeApiClient {
&self,
proposal: versioned::VersionedSignedProposal,
) -> Result<()> {
let version = proposal
.version
.to_consensus_version()
.map_err(error_message)?;
let version =
crate::ConsensusVersion::try_from(&proposal.version).map_err(error_message)?;
let body = proposal_request_body(proposal)?;
let request = crate::PublishBlockV2Request {
query: crate::PublishBlockV2RequestQuery {
Expand All @@ -157,10 +155,8 @@ impl EthBeaconNodeApiClient {
&self,
proposal: versioned::VersionedSignedBlindedProposal,
) -> Result<()> {
let version = proposal
.version
.to_consensus_version()
.map_err(error_message)?;
let version =
crate::ConsensusVersion::try_from(&proposal.version).map_err(error_message)?;
let body = blinded_proposal_request_body(proposal)?;
let request = crate::PublishBlindedBlockV2Request {
query: crate::PublishBlindedBlockV2RequestQuery {
Expand Down Expand Up @@ -233,12 +229,11 @@ impl EthBeaconNodeApiClient {
&self,
aggregate_and_proofs: Vec<versioned::VersionedSignedAggregateAndProof>,
) -> Result<()> {
let version = aggregate_and_proofs
let data_version = aggregate_and_proofs
.first()
.map(|aggregate| aggregate.version)
.unwrap_or(versioned::DataVersion::Phase0)
.to_consensus_version()
.map_err(error_message)?;
.unwrap_or(versioned::DataVersion::Phase0);
let version = crate::ConsensusVersion::try_from(&data_version).map_err(error_message)?;
let body = aggregate_and_proofs_request_body(aggregate_and_proofs)?;
let request = crate::PublishAggregateAndProofsV2Request {
header: crate::PublishAggregateAndProofsV2RequestHeader {
Expand Down
Loading