From 3977ed5c826dc5005a5aad7bb2fa815237f915de Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Mon, 29 Mar 2021 14:58:05 -0600 Subject: [PATCH] Future-aware enum name --- client/src/rpc_config.rs | 8 ++++---- core/src/rpc.rs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/src/rpc_config.rs b/client/src/rpc_config.rs index 63129fa595..03b0a9cda6 100644 --- a/client/src/rpc_config.rs +++ b/client/src/rpc_config.rs @@ -178,16 +178,16 @@ impl EncodingConfig for RpcConfirmedTransactionConfig { #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[serde(untagged)] -pub enum RpcConfirmedBlocksConfig { +pub enum RpcConfirmedBlocksConfigWrapper { EndSlotOnly(Option), CommitmentOnly(Option), } -impl RpcConfirmedBlocksConfig { +impl RpcConfirmedBlocksConfigWrapper { pub fn unzip(&self) -> (Option, Option) { match &self { - RpcConfirmedBlocksConfig::EndSlotOnly(end_slot) => (*end_slot, None), - RpcConfirmedBlocksConfig::CommitmentOnly(commitment) => (None, *commitment), + RpcConfirmedBlocksConfigWrapper::EndSlotOnly(end_slot) => (*end_slot, None), + RpcConfirmedBlocksConfigWrapper::CommitmentOnly(commitment) => (None, *commitment), } } } diff --git a/core/src/rpc.rs b/core/src/rpc.rs index 10641a5622..55f03e3a67 100644 --- a/core/src/rpc.rs +++ b/core/src/rpc.rs @@ -2318,7 +2318,7 @@ pub mod rpc_full { &self, meta: Self::Metadata, start_slot: Slot, - config: Option, + config: Option, commitment: Option, ) -> Result>; @@ -2976,7 +2976,7 @@ pub mod rpc_full { &self, meta: Self::Metadata, start_slot: Slot, - config: Option, + config: Option, commitment: Option, ) -> Result> { let (end_slot, maybe_commitment) =