Remove the state attribute

coral-xyz · Nov 25, 2022 · c837737 · c837737
1 parent a73bd72
commit c837737
Show file tree

Hide file tree

Showing 21 changed files with 55 additions and 1,607 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/src/lib.rs b/client/src/lib.rs
@@ -5,7 +5,6 @@ use anchor_lang::solana_program::hash::Hash;
 use anchor_lang::solana_program::instruction::{AccountMeta, Instruction};
 use anchor_lang::solana_program::program_error::ProgramError;
 use anchor_lang::solana_program::pubkey::Pubkey;
-use anchor_lang::solana_program::system_program;
 use anchor_lang::{AccountDeserialize, Discriminator, InstructionData, ToAccountMetas};
 use regex::Regex;
 use solana_account_decoder::UiAccountEncoding;
@@ -176,10 +175,6 @@ impl Program {
         })
     }
 
-    pub fn state<T: AccountDeserialize>(&self) -> Result<T, ClientError> {
-        self.account(anchor_lang::__private::state::address(&self.program_id))
-    }
-
     pub fn rpc(&self) -> RpcClient {
         RpcClient::new_with_commitment(
             self.cfg.cluster.url().to_string(),
@@ -496,25 +491,25 @@ impl<'a> RequestBuilder<'a> {
 
     pub fn instructions(&self) -> Result<Vec<Instruction>, ClientError> {
         let mut accounts = match self.namespace {
-            RequestNamespace::State { new } => match new {
-                false => vec![AccountMeta::new(
-                    anchor_lang::__private::state::address(&self.program_id),
-                    false,
-                )],
-                true => vec![
-                    AccountMeta::new_readonly(self.payer.pubkey(), true),
-                    AccountMeta::new(
-                        anchor_lang::__private::state::address(&self.program_id),
-                        false,
-                    ),
-                    AccountMeta::new_readonly(
-                        Pubkey::find_program_address(&[], &self.program_id).0,
-                        false,
-                    ),
-                    AccountMeta::new_readonly(system_program::ID, false),
-                    AccountMeta::new_readonly(self.program_id, false),
-                ],
-            },
+            // RequestNamespace::State { new } => match new {
+            //     // false => vec![AccountMeta::new(
+            //     //     anchor_lang::__private::state::address(&self.program_id),
+            //     //     false,
+            //     // )],
+            //     true => vec![
+            //         AccountMeta::new_readonly(self.payer.pubkey(), true),
+            //         // AccountMeta::new(
+            //         //     anchor_lang::__private::state::address(&self.program_id),
+            //         //     false,
+            //         // ),
+            //         AccountMeta::new_readonly(
+            //             Pubkey::find_program_address(&[], &self.program_id).0,
+            //             false,
+            //         ),
+            //         AccountMeta::new_readonly(system_program::ID, false),
+            //         AccountMeta::new_readonly(self.program_id, false),
+            //     ],
+            // },
             _ => Vec::new(),
         };
         accounts.extend_from_slice(&self.accounts);

diff --git a/lang/Cargo.toml b/lang/Cargo.toml
@@ -21,7 +21,6 @@ anchor-debug = [
     "anchor-attribute-interface/anchor-debug",
     "anchor-attribute-program/anchor-debug",
     "anchor-attribute-program/anchor-debug",
-    "anchor-attribute-state/anchor-debug",
     "anchor-derive-accounts/anchor-debug"
 ]
 
@@ -31,7 +30,6 @@ anchor-attribute-account = { path = "./attribute/account", version = "0.25.0" }
 anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.0" }
 anchor-attribute-error = { path = "./attribute/error", version = "0.25.0" }
 anchor-attribute-program = { path = "./attribute/program", version = "0.25.0" }
-anchor-attribute-state = { path = "./attribute/state", version = "0.25.0" }
 anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.0" }
 anchor-attribute-event = { path = "./attribute/event", version = "0.25.0" }
 anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.0" }

diff --git a/lang/attribute/state/Cargo.toml b/lang/attribute/state/Cargo.toml
diff --git a/lang/attribute/state/src/lib.rs b/lang/attribute/state/src/lib.rs
diff --git a/lang/src/accounts/cpi_state.rs b/lang/src/accounts/cpi_state.rs
diff --git a/lang/src/accounts/mod.rs b/lang/src/accounts/mod.rs
@@ -9,18 +9,12 @@ pub mod boxed;
 pub mod cpi_account;
 #[doc(hidden)]
 #[allow(deprecated)]
-pub mod cpi_state;
-#[doc(hidden)]
-#[allow(deprecated)]
 pub mod loader;
 pub mod program;
 #[doc(hidden)]
 #[allow(deprecated)]
 pub mod program_account;
 pub mod signer;
-#[doc(hidden)]
-#[allow(deprecated)]
-pub mod state;
 pub mod system_account;
 pub mod sysvar;
 pub mod unchecked_account;