override try_from_slice for same dx as anchor

gzalz · gzalz · commit da6f274bf01d · 2025-09-16T11:42:07.000-06:00
diff --git a/priority_fee_distribution_sdk/src/lib.rs b/priority_fee_distribution_sdk/src/lib.rs
@@ -40,13 +40,13 @@ pub struct Config {
 impl Config {
     pub const DISCRIMINATOR: [u8; 8] = [0; 8];
 
-    pub fn try_deserialize(data: &[u8]) -> Result<Self> {
+    pub fn try_from_slice(data: &[u8]) -> Result<Self> {
         let (discriminator, remainder) = data.split_at(8);
         anyhow::ensure!(
             discriminator == Self::DISCRIMINATOR,
             "Invalid discriminator"
         );
-        Ok(Self::try_from_slice(&remainder)?)
+        Ok(<Self as BorshDeserialize>::try_from_slice(&remainder)?)
     }
 }
 
@@ -63,13 +63,13 @@ pub struct ClaimStatus {
 impl ClaimStatus {
     pub const DISCRIMINATOR: [u8; 8] = [0; 8];
 
-    pub fn try_deserialize(data: &[u8]) -> Result<Self> {
+    pub fn try_from_slice(data: &[u8]) -> Result<Self> {
         let (discriminator, remainder) = data.split_at(8);
         anyhow::ensure!(
             discriminator == Self::DISCRIMINATOR,
             "Invalid discriminator"
         );
-        Ok(Self::try_from_slice(&remainder)?)
+        Ok(<Self as BorshDeserialize>::try_from_slice(&remainder)?)
     }
 }
 
@@ -104,13 +104,13 @@ pub struct PriorityFeeDistributionAccount {
 impl PriorityFeeDistributionAccount {
     pub const DISCRIMINATOR: [u8; 8] = [0; 8];
 
-    pub fn try_deserialize(data: &[u8]) -> Result<Self> {
+    pub fn try_from_slice(data: &[u8]) -> Result<Self> {
         let (discriminator, remainder) = data.split_at(8);
         anyhow::ensure!(
             discriminator == Self::DISCRIMINATOR,
             "Invalid discriminator"
         );
-        Ok(Self::try_from_slice(&remainder)?)
+        Ok(<Self as BorshDeserialize>::try_from_slice(&remainder)?)
     }
 }
 
diff --git a/tip-router-operator-cli/src/claim.rs b/tip-router-operator-cli/src/claim.rs
@@ -604,7 +604,7 @@ pub async fn get_unprocessed_claims_for_validators(
 
     let deserialized_claim_statuses = claim_statuses.values().map(|a| {
         (
-            ClaimStatus::try_from_slice(&mut a.data.as_slice()).unwrap(),
+            ClaimStatus::try_from_slice(&a.data).unwrap(),
             a,
         )
     });
diff --git a/tip-router-operator-cli/src/reclaim.rs b/tip-router-operator-cli/src/reclaim.rs
@@ -300,7 +300,7 @@ async fn close_tip_distribution_account_transactions(
         .ok_or_else(|| anyhow::anyhow!("Config account not found"))?;
 
     let tip_distribution_config =
-        TipDistributionConfig::try_deserialize(&mut config_account.data.as_slice())?;
+        TipDistributionConfig::try_from_slice(&config_account.data)?;
 
     let instructions: Vec<_> = accounts
         .iter()
@@ -342,7 +342,7 @@ async fn close_priority_fee_distribution_account_transactions(
         .ok_or_else(|| anyhow::anyhow!("Config account not found"))?;
 
     let priority_fee_distribution_config =
-        PriorityFeeDistributionConfig::try_deserialize(&mut config_account.data.as_slice())?;
+        PriorityFeeDistributionConfig::try_from_slice(&config_account.data)?;
 
     let instructions: Vec<_> = accounts
         .iter()
@@ -446,7 +446,7 @@ pub async fn fetch_expired_distribution_accounts(
         .iter()
         .flat_map(|(pubkey, account)| {
             let tip_distribution_account =
-                TipDistributionAccount::try_deserialize(&mut account.data.as_slice());
+                TipDistributionAccount::try_from_slice(&mut account.data.as_slice());
             tip_distribution_account.map_or_else(
                 |_| vec![],
                 |tip_distribution_account| vec![(*pubkey, tip_distribution_account)],
@@ -457,7 +457,7 @@ pub async fn fetch_expired_distribution_accounts(
         .iter()
         .flat_map(|(pubkey, account)| {
             let priority_fee_distribution_account =
-                PriorityFeeDistributionAccount::try_deserialize(&mut account.data.as_slice());
+                PriorityFeeDistributionAccount::try_from_slice(&account.data);
             priority_fee_distribution_account.map_or_else(
                 |_| vec![],
                 |priority_fee_distribution_account| {
@@ -538,7 +538,7 @@ async fn fetch_expired_claim_statuses(
         .iter()
         .flat_map(|(pubkey, account)| {
             let tip_distribution_claim_status =
-                TipDistributionClaimStatus::try_deserialize(&mut account.data.as_slice());
+                TipDistributionClaimStatus::try_from_slice(&mut account.data.as_slice());
             tip_distribution_claim_status.map_or_else(
                 |_| vec![],
                 |tip_distribution_claim_status| vec![(*pubkey, tip_distribution_claim_status)],
@@ -550,7 +550,7 @@ async fn fetch_expired_claim_statuses(
         .iter()
         .flat_map(|(pubkey, account)| {
             let priority_fee_distribution_claim_status =
-                PriorityFeeDistributionClaimStatus::try_deserialize(&mut account.data.as_slice());
+                PriorityFeeDistributionClaimStatus::try_from_slice(&account.data);
             priority_fee_distribution_claim_status.map_or_else(
                 |_| vec![],
                 |priority_fee_distribution_claim_status| {
diff --git a/tip-router-operator-cli/src/submit.rs b/tip-router-operator-cli/src/submit.rs
@@ -341,7 +341,7 @@ async fn get_tip_distribution_accounts_to_upload(
         .into_iter()
         .filter_map(|(pubkey, account)| {
             let tip_distribution_account =
-                TipDistributionAccount::try_deserialize(&mut account.data.as_slice());
+                TipDistributionAccount::try_from_slice(&account.data);
             tip_distribution_account.map_or(None, |tip_distribution_account| {
                 if tip_distribution_account.epoch_created_at == epoch
                     && tip_distribution_account.merkle_root_upload_authority
@@ -398,7 +398,7 @@ async fn get_priority_fee_distribution_accounts_to_upload(
         .into_iter()
         .filter_map(|(pubkey, account)| {
             let tip_distribution_account =
-                PriorityFeeDistributionAccount::try_deserialize(&mut account.data.as_slice());
+                PriorityFeeDistributionAccount::try_from_slice(&account.data);
             tip_distribution_account.map_or(None, |tip_distribution_account| {
                 if tip_distribution_account.epoch_created_at == epoch
                     && tip_distribution_account.merkle_root_upload_authority
diff --git a/tip-router-operator-cli/src/tip_distribution_stats.rs b/tip-router-operator-cli/src/tip_distribution_stats.rs
@@ -95,7 +95,7 @@ async fn get_tip_distribution_accounts_for_epoch(
     let mut result = Vec::new();
     for (pubkey, account) in accounts {
         if let Ok(tip_distribution_account) =
-            TipDistributionAccount::try_deserialize(&mut account.data.as_slice())
+            TipDistributionAccount::try_from_slice(&account.data)
         {
             if tip_distribution_account.epoch_created_at == epoch {
                 result.push((pubkey, tip_distribution_account));
@@ -128,7 +128,7 @@ async fn get_priority_fee_distribution_accounts_for_epoch(
     let mut result = Vec::new();
     for (pubkey, account) in accounts {
         if let Ok(priority_fee_distribution_account) =
-            PriorityFeeDistributionAccount::try_deserialize(&mut account.data.as_slice())
+            PriorityFeeDistributionAccount::try_from_slice(&account.data)
         {
             if priority_fee_distribution_account.epoch_created_at == epoch {
                 result.push((pubkey, priority_fee_distribution_account));
diff --git a/tip_distribution_sdk/src/lib.rs b/tip_distribution_sdk/src/lib.rs
@@ -39,13 +39,13 @@ pub struct Config {
 impl Config {
     pub const DISCRIMINATOR: [u8; 8] = [0x9b, 0x0c, 0xaa, 0xe0, 0x1e, 0xfa, 0xcc, 82];
 
-    pub fn try_deserialize(data: &[u8]) -> Result<Self> {
+    pub fn try_from_slice(data: &[u8]) -> Result<Self> {
         let (discriminator, remainder) = data.split_at(8);
         anyhow::ensure!(
             discriminator == Self::DISCRIMINATOR,
             "Invalid discriminator"
         );
-        Ok(Self::try_from_slice(&remainder)?)
+        Ok(<Self as BorshDeserialize>::try_from_slice(&remainder)?)
     }
 }
 
@@ -94,13 +94,13 @@ pub struct TipDistributionAccount {
 impl TipDistributionAccount {
     pub const DISCRIMINATOR: [u8; 8] = [0x55, 0x40, 0x71, 0xc6, 0xea, 0x5e, 0x78, 0x7b];
 
-    pub fn try_deserialize(data: &[u8]) -> Result<Self> {
+    pub fn try_from_slice(data: &[u8]) -> Result<Self> {
         let (discriminator, remainder) = data.split_at(8);
         anyhow::ensure!(
             discriminator == Self::DISCRIMINATOR,
             "Invalid discriminator"
         );
-        Ok(Self::try_from_slice(&remainder)?)
+        Ok(<Self as BorshDeserialize>::try_from_slice(&remainder)?)
     }
 }
 
@@ -132,13 +132,13 @@ pub struct ClaimStatus {
 impl ClaimStatus {
     pub const DISCRIMINATOR: [u8; 8] = [0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00];
 
-    pub fn try_deserialize(data: &[u8]) -> Result<Self> {
+    pub fn try_from_slice(data: &[u8]) -> Result<Self> {
         let (discriminator, remainder) = data.split_at(8);
         anyhow::ensure!(
             discriminator == Self::DISCRIMINATOR,
             "Invalid discriminator"
         );
-        Ok(Self::try_from_slice(&remainder)?)
+        Ok(<Self as BorshDeserialize>::try_from_slice(&remainder)?)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -604,7 +604,7 @@ pub async fn get_unprocessed_claims_for_validators(`
`604`	`604`
`605`	`605`	`let deserialized_claim_statuses = claim_statuses.values().map(\|a\| {`
`606`	`606`	`(`
`607`		`- ClaimStatus::try_from_slice(&mut a.data.as_slice()).unwrap(),`
	`607`	`+ ClaimStatus::try_from_slice(&a.data).unwrap(),`
`608`	`608`	`a,`
`609`	`609`	`)`
`610`	`610`	`});`