feat: add Clone and Copy to more structs and enums

ifiokjr · Jan 17, 2025 · 33ac2b5 · 33ac2b5
1 parent 01ad710
commit 33ac2b5
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 33 deletions.
diff --git a/crates/wasm_client_solana/src/rpc_filter.rs b/crates/wasm_client_solana/src/rpc_filter.rs
@@ -355,7 +355,7 @@ impl VersionReq {
 	}
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub enum TokenAccountsFilter {
 	Mint(Pubkey),
 	ProgramId(Pubkey),

diff --git a/crates/wasm_client_solana/src/rpc_response.rs b/crates/wasm_client_solana/src/rpc_response.rs
@@ -125,7 +125,7 @@ pub struct RpcBlockCommitment<T> {
 }
 
 #[serde_as]
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcBlockhashFeeCalculator {
 	#[serde_as(as = "DisplayFromStr")]
@@ -134,11 +134,7 @@ pub struct RpcBlockhashFeeCalculator {
 }
 
 #[serde_as]
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
-struct A(#[serde_as(as = "DisplayFromStr")] Pubkey);
-
-#[serde_as]
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcBlockhash {
 	#[serde_as(as = "DisplayFromStr")]
@@ -147,7 +143,7 @@ pub struct RpcBlockhash {
 }
 
 #[serde_as]
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcFees {
 	#[serde_as(as = "DisplayFromStr")]
@@ -158,7 +154,7 @@ pub struct RpcFees {
 }
 
 #[serde_as]
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct DeprecatedRpcFees {
 	#[serde_as(as = "DisplayFromStr")]
@@ -168,7 +164,7 @@ pub struct DeprecatedRpcFees {
 }
 
 #[serde_as]
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct Fees {
 	#[serde_as(as = "DisplayFromStr")]
@@ -177,7 +173,7 @@ pub struct Fees {
 	pub last_valid_block_height: u64,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcFeeCalculator {
 	pub fee_calculator: FeeCalculator,
@@ -189,7 +185,7 @@ pub struct RpcFeeRateGovernor {
 	pub fee_rate_governor: FeeRateGovernor,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize, Clone, Copy, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcInflationGovernor {
 	pub initial: f64,
@@ -578,7 +574,7 @@ pub struct RpcSupply {
 	pub non_circulating_accounts: Vec<String>,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub enum StakeActivationState {
 	Activating,
@@ -587,7 +583,7 @@ pub enum StakeActivationState {
 	Inactive,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcStakeActivation {
 	pub state: StakeActivationState,
@@ -619,7 +615,7 @@ pub struct RpcConfirmedTransactionStatusWithSignature {
 	pub confirmation_status: Option<TransactionConfirmationStatus>,
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcPerfSample {
 	pub slot: Slot,
@@ -636,7 +632,7 @@ impl RpcPerfSample {
 }
 
 #[skip_serializing_none]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcInflationReward {
 	pub epoch: Epoch,
@@ -646,7 +642,7 @@ pub struct RpcInflationReward {
 	pub commission: Option<u8>, // Vote account commission when the reward was credited
 }
 
-#[derive(Clone, Deserialize, Serialize, Debug, Error, Eq, PartialEq)]
+#[derive(Clone, Copy, Deserialize, Serialize, Debug, Error, Eq, PartialEq)]
 pub enum RpcBlockUpdateError {
 	#[error("block store error")]
 	BlockStoreError,

diff --git a/crates/wasm_client_solana/src/solana_account_decoder/parse_config.rs b/crates/wasm_client_solana/src/solana_account_decoder/parse_config.rs
@@ -77,15 +77,15 @@ where
 	Some(UiConfig { keys, config_data })
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase", tag = "type", content = "info")]
 pub enum ConfigAccountType {
 	StakeConfig(UiStakeConfig),
 	ValidatorInfo(UiConfig<Value>),
 }
 
 #[serde_as]
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct UiConfigKey {
 	#[serde_as(as = "DisplayFromStr")]
@@ -97,7 +97,7 @@ pub struct UiConfigKey {
 	since = "1.16.7",
 	note = "Please use `solana_sdk::stake::state::warmup_cooldown_rate()` instead"
 )]
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct UiStakeConfig {
 	pub warmup_cooldown_rate: f64,
@@ -113,7 +113,7 @@ impl From<StakeConfig> for UiStakeConfig {
 	}
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct UiConfig<T> {
 	pub keys: Vec<UiConfigKey>,

diff --git a/crates/wasm_client_solana/src/solana_account_decoder/parse_nonce.rs b/crates/wasm_client_solana/src/solana_account_decoder/parse_nonce.rs
@@ -36,7 +36,7 @@ pub fn parse_nonce(data: &[u8]) -> Result<UiNonceState, ParseAccountError> {
 }
 
 /// A duplicate representation of `NonceState` for pretty JSON serialization
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase", tag = "type", content = "info")]
 pub enum UiNonceState {
 	Uninitialized,
@@ -45,7 +45,7 @@ pub enum UiNonceState {
 
 #[serde_as]
 #[skip_serializing_none]
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct UiNonceData {
 	#[serde_as(as = "DisplayFromStr")]

diff --git a/crates/wasm_client_solana/src/solana_account_decoder/parse_sysvar.rs b/crates/wasm_client_solana/src/solana_account_decoder/parse_sysvar.rs
@@ -121,7 +121,7 @@ pub fn parse_sysvar(data: &[u8], pubkey: &Pubkey) -> Result<SysvarAccountType, P
 	))
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase", tag = "type", content = "info")]
 pub enum SysvarAccountType {
 	Clock(UiClock),
@@ -139,7 +139,7 @@ pub enum SysvarAccountType {
 	EpochRewards(EpochRewards),
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Default)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct UiClock {
 	pub slot: Slot,
@@ -161,7 +161,7 @@ impl From<Clock> for UiClock {
 	}
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Default)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct UiFees {
 	pub fee_calculator: UiFeeCalculator,
@@ -175,7 +175,7 @@ impl From<Fees> for UiFees {
 	}
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq, Default)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct UiRent {
 	pub lamports_per_byte_year: StringAmount,
@@ -193,7 +193,7 @@ impl From<Rent> for UiRent {
 	}
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq, Default)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct UiRewards {
 	pub validator_point_value: f64,
@@ -209,7 +209,7 @@ impl From<Rewards> for UiRewards {
 
 #[serde_as]
 #[skip_serializing_none]
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct UiRecentBlockhashesEntry {
 	#[serde_as(as = "DisplayFromStr")]
@@ -219,15 +219,15 @@ pub struct UiRecentBlockhashesEntry {
 
 #[serde_as]
 #[skip_serializing_none]
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct UiSlotHashEntry {
 	pub slot: Slot,
 	#[serde_as(as = "DisplayFromStr")]
 	pub hash: Hash,
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct UiSlotHistory {
 	pub next_slot: Slot,
@@ -249,14 +249,14 @@ impl std::fmt::Debug for SlotHistoryBits {
 	}
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct UiStakeHistoryEntry {
 	pub epoch: Epoch,
 	pub stake_history: StakeHistoryEntry,
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Default)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct UiLastRestartSlot {
 	pub last_restart_slot: Slot,