blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Future-aware enum name

This commit is contained in:
Tyera Eulberg 2021-03-29 14:58:05 -06:00
parent 60ed8e2892
commit 3977ed5c82
No known key found for this signature in database
GPG Key ID: 92310FD3120230CF
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/rpc_config.rs
View File

@ -178,16 +178,16 @@ impl EncodingConfig for RpcConfirmedTransactionConfig {
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(untagged)] #[serde(untagged)]
pub enum RpcConfirmedBlocksConfig { pub enum RpcConfirmedBlocksConfigWrapper {
EndSlotOnly(Option<Slot>), EndSlotOnly(Option<Slot>),
CommitmentOnly(Option<CommitmentConfig>), CommitmentOnly(Option<CommitmentConfig>),
} }
impl RpcConfirmedBlocksConfig { impl RpcConfirmedBlocksConfigWrapper {
pub fn unzip(&self) -> (Option<Slot>, Option<CommitmentConfig>) { pub fn unzip(&self) -> (Option<Slot>, Option<CommitmentConfig>) {
match &self { match &self {
RpcConfirmedBlocksConfig::EndSlotOnly(end_slot) => (*end_slot, None), RpcConfirmedBlocksConfigWrapper::EndSlotOnly(end_slot) => (*end_slot, None),
RpcConfirmedBlocksConfig::CommitmentOnly(commitment) => (None, *commitment), RpcConfirmedBlocksConfigWrapper::CommitmentOnly(commitment) => (None, *commitment),
} }
} }
} }

4
core/src/rpc.rs
View File

@ -2318,7 +2318,7 @@ pub mod rpc_full {
&self, &self,
meta: Self::Metadata, meta: Self::Metadata,
start_slot: Slot, start_slot: Slot,
config: Option<RpcConfirmedBlocksConfig>, config: Option<RpcConfirmedBlocksConfigWrapper>,
commitment: Option<CommitmentConfig>, commitment: Option<CommitmentConfig>,
) -> Result<Vec<Slot>>; ) -> Result<Vec<Slot>>;
@ -2976,7 +2976,7 @@ pub mod rpc_full {
&self, &self,
meta: Self::Metadata, meta: Self::Metadata,
start_slot: Slot, start_slot: Slot,
config: Option<RpcConfirmedBlocksConfig>, config: Option<RpcConfirmedBlocksConfigWrapper>,
commitment: Option<CommitmentConfig>, commitment: Option<CommitmentConfig>,
) -> Result<Vec<Slot>> { ) -> Result<Vec<Slot>> {
let (end_slot, maybe_commitment) = let (end_slot, maybe_commitment) =