move account_utils to account crate (#3174)

* move account_utils to account crate * remove superfluous import
anza-xyz · Oct 15, 2024 · 1740ea2 · 1740ea2
1 parent 598f7ae
commit 1740ea2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/sdk/account/Cargo.toml b/sdk/account/Cargo.toml
@@ -17,14 +17,16 @@ serde_bytes = { workspace = true, optional = true }
 serde_derive = { workspace = true, optional = true }
 solana-frozen-abi = { workspace = true, optional = true }
 solana-frozen-abi-macro = { workspace = true, optional = true }
+solana-instruction = { workspace = true, optional = true }
 solana-logger = { workspace = true, optional = true }
 solana-program = { workspace = true }
 
 [dev-dependencies]
 solana-account = { path = ".", features = ["dev-context-only-utils"] }
+solana-pubkey = { workspace = true }
 
 [features]
-bincode = ["dep:bincode", "serde"]
+bincode = ["dep:bincode", "dep:solana-instruction", "serde"]
 dev-context-only-utils = ["bincode", "dep:qualifier_attr"]
 frozen-abi = [
     "dep:solana-frozen-abi",

diff --git a/sdk/account/src/lib.rs b/sdk/account/src/lib.rs
@@ -29,6 +29,8 @@ use {
         sync::Arc,
     },
 };
+#[cfg(feature = "bincode")]
+pub mod state_traits;
 
 /// An Account with data that is stored on chain
 #[repr(C)]

diff --git a/sdk/src/account_utils.rs → sdk/account/src/state_traits.rs b/sdk/src/account_utils.rs → sdk/account/src/state_traits.rs
@@ -1,9 +1,9 @@
 //! Useful extras for `Account` state.
 
 use {
-    crate::instruction::InstructionError,
+    crate::{Account, AccountSharedData},
     bincode::ErrorKind,
-    solana_account::{Account, AccountSharedData},
+    solana_instruction::error::InstructionError,
     std::cell::Ref,
 };
 
@@ -64,7 +64,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use {super::*, crate::pubkey::Pubkey, solana_account::AccountSharedData};
+    use {super::*, solana_pubkey::Pubkey};
 
     #[test]
     fn test_account_state() {

diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs
@@ -58,7 +58,6 @@ pub use solana_program::{
 };
 #[cfg(feature = "borsh")]
 pub use solana_program::{borsh, borsh0_10, borsh1};
-pub mod account_utils;
 pub mod client;
 pub mod commitment_config;
 pub mod compute_budget;
@@ -108,6 +107,11 @@ pub mod wasm;
 
 #[deprecated(since = "2.1.0", note = "Use `solana-account` crate instead")]
 pub use solana_account as account;
+#[deprecated(
+    since = "2.1.0",
+    note = "Use `solana_account::state_traits` crate instead"
+)]
+pub use solana_account::state_traits as account_utils;
 #[deprecated(since = "2.1.0", note = "Use `solana-bn254` crate instead")]
 pub use solana_bn254 as alt_bn128;
 #[deprecated(since = "2.1.0", note = "Use `solana-decode-error` crate instead")]