Updated patterns + deps

Author: grod220

Cargo.lock

@@ -1,18 +1,22 @@
 [package]
 name = "p-stake-interface"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 authors = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }
 license = { workspace = true }
 
+[features]
+serde = ["dep:serde"]
+
 [dependencies]
-solana-pubkey = "3.0.0"
-wincode = { git = "https://github.com/anza-xyz/wincode", rev = "19a7dc6f56e20ff7978cd4f4b4ae7e0ae74f2457", default-features = false, features = ["alloc", "derive"] }
-solana-clock = "3"
+solana-address = "1.0.0"
+wincode = { git = "https://github.com/anza-xyz/wincode.git", branch = "master", default-features = false, features = ["derive"] }
+serde = { version = "1.0", features = ["derive"], optional = true }
 
 [dev-dependencies]
 bincode = "1.3.3"
-proptest = "1.6.0"
+proptest = "1.9.0"
+solana-pubkey = "3.0.0"
 solana-stake-interface = { path = "../../interface", features = ["bincode"] }

pinocchio/interface/Cargo.toml

@@ -1,39 +1,36 @@
-// TODO: These may not be backward compatible with StakeStakeV2 serialization errs in interface/src/state.rs
-//       Need to think about this.
+//! Error types for stake state parsing.
+
+use crate::state::StakeStateV2Tag;
+
 #[derive(Debug)]
 pub enum StakeStateError {
-    WrongLength { expected: usize, actual: usize },
+    /// Input is shorter than 200 bytes.
+    UnexpectedEof,
+
+    /// The discriminant tag is not a valid variant
+    InvalidTag(u32),
+
+    /// An invalid state transition was attempted.
+    InvalidTransition {
+        from: StakeStateV2Tag,
+        to: StakeStateV2Tag,
+    },
+
+    /// Pass-through for wincode read errors.
     Read(wincode::ReadError),
+
+    /// Pass-through for wincode write errors.
+    Write(wincode::WriteError),
 }
 
 impl From<wincode::ReadError> for StakeStateError {
-    #[inline(always)]
     fn from(e: wincode::ReadError) -> Self {
-        Self::Read(e)
+        StakeStateError::Read(e)
     }
 }
 
-#[inline(always)]
-pub(crate) fn invalid_tag(tag: u32) -> StakeStateError {
-    StakeStateError::Read(wincode::error::invalid_tag_encoding(tag as usize))
-}
-
-#[inline(always)]
-pub(crate) fn slice_as_array<const N: usize>(s: &[u8]) -> Result<&[u8; N], StakeStateError> {
-    s.try_into().map_err(|_| {
-        StakeStateError::Read(wincode::ReadError::Custom(
-            "slice length mismatch for array",
-        ))
-    })
-}
-
-#[inline(always)]
-pub(crate) fn slice_as_array_mut<const N: usize>(
-    s: &mut [u8],
-) -> Result<&mut [u8; N], StakeStateError> {
-    s.try_into().map_err(|_| {
-        StakeStateError::Read(wincode::ReadError::Custom(
-            "slice length mismatch for array",
-        ))
-    })
+impl From<wincode::WriteError> for StakeStateError {
+    fn from(e: wincode::WriteError) -> Self {
+        StakeStateError::Write(e)
+    }
 }

pinocchio/interface/src/error.rs

@@ -1,3 +1,2 @@
 pub mod error;
-pub mod pod;
 pub mod state;