lang: move accounts into their own module (#1139)
This commit is contained in:
parent
c0a0ce2857
commit
a8280b786c
|
@ -1,5 +1,5 @@
|
||||||
use crate::error::ErrorCode;
|
|
||||||
use crate::*;
|
use crate::*;
|
||||||
|
use crate::{error::ErrorCode, prelude::Account};
|
||||||
use solana_program::account_info::AccountInfo;
|
use solana_program::account_info::AccountInfo;
|
||||||
use solana_program::entrypoint::ProgramResult;
|
use solana_program::entrypoint::ProgramResult;
|
||||||
use solana_program::instruction::AccountMeta;
|
use solana_program::instruction::AccountMeta;
|
|
@ -1,10 +1,10 @@
|
||||||
use crate::error::ErrorCode;
|
use crate::error::ErrorCode;
|
||||||
|
#[allow(deprecated)]
|
||||||
|
use crate::{accounts::state::ProgramState, CpiStateContext};
|
||||||
use crate::{
|
use crate::{
|
||||||
AccountDeserialize, AccountSerialize, Accounts, AccountsExit, Key, ToAccountInfo,
|
AccountDeserialize, AccountSerialize, Accounts, AccountsExit, Key, ToAccountInfo,
|
||||||
ToAccountInfos, ToAccountMetas,
|
ToAccountInfos, ToAccountMetas,
|
||||||
};
|
};
|
||||||
#[allow(deprecated)]
|
|
||||||
use crate::{CpiStateContext, ProgramState};
|
|
||||||
use solana_program::account_info::AccountInfo;
|
use solana_program::account_info::AccountInfo;
|
||||||
use solana_program::entrypoint::ProgramResult;
|
use solana_program::entrypoint::ProgramResult;
|
||||||
use solana_program::instruction::AccountMeta;
|
use solana_program::instruction::AccountMeta;
|
|
@ -0,0 +1,24 @@
|
||||||
|
pub mod account;
|
||||||
|
pub mod account_info;
|
||||||
|
pub mod boxed;
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[allow(deprecated)]
|
||||||
|
pub mod cpi_account;
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[allow(deprecated)]
|
||||||
|
pub mod cpi_state;
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[allow(deprecated)]
|
||||||
|
pub mod loader;
|
||||||
|
pub mod loader_account;
|
||||||
|
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;
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::error::ErrorCode;
|
|
||||||
#[allow(deprecated)]
|
#[allow(deprecated)]
|
||||||
use crate::CpiAccount;
|
use crate::accounts::cpi_account::CpiAccount;
|
||||||
|
use crate::error::ErrorCode;
|
||||||
use crate::{
|
use crate::{
|
||||||
AccountDeserialize, AccountSerialize, Accounts, AccountsClose, AccountsExit, Key,
|
AccountDeserialize, AccountSerialize, Accounts, AccountsClose, AccountsExit, Key,
|
||||||
ToAccountInfo, ToAccountInfos, ToAccountMetas,
|
ToAccountInfo, ToAccountInfos, ToAccountMetas,
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::error::ErrorCode;
|
|
||||||
#[allow(deprecated)]
|
#[allow(deprecated)]
|
||||||
use crate::CpiAccount;
|
use crate::accounts::cpi_account::CpiAccount;
|
||||||
|
use crate::error::ErrorCode;
|
||||||
use crate::{
|
use crate::{
|
||||||
AccountDeserialize, AccountSerialize, Accounts, AccountsExit, Key, ToAccountInfo,
|
AccountDeserialize, AccountSerialize, Accounts, AccountsExit, Key, ToAccountInfo,
|
||||||
ToAccountInfos, ToAccountMetas,
|
ToAccountInfos, ToAccountMetas,
|
|
@ -31,58 +31,45 @@ use solana_program::program_error::ProgramError;
|
||||||
use solana_program::pubkey::Pubkey;
|
use solana_program::pubkey::Pubkey;
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
|
|
||||||
mod account;
|
|
||||||
mod account_info;
|
|
||||||
mod account_meta;
|
mod account_meta;
|
||||||
mod boxed;
|
mod accounts;
|
||||||
mod bpf_upgradeable_state;
|
mod bpf_upgradeable_state;
|
||||||
mod common;
|
mod common;
|
||||||
mod context;
|
mod context;
|
||||||
mod cpi_account;
|
|
||||||
mod cpi_state;
|
|
||||||
mod ctor;
|
mod ctor;
|
||||||
mod error;
|
mod error;
|
||||||
#[doc(hidden)]
|
#[doc(hidden)]
|
||||||
pub mod idl;
|
pub mod idl;
|
||||||
mod loader;
|
|
||||||
mod loader_account;
|
|
||||||
mod program;
|
|
||||||
mod program_account;
|
|
||||||
mod signer;
|
|
||||||
pub mod state;
|
|
||||||
mod system_account;
|
|
||||||
mod system_program;
|
mod system_program;
|
||||||
mod sysvar;
|
|
||||||
mod unchecked_account;
|
|
||||||
mod vec;
|
|
||||||
|
|
||||||
pub use crate::account::Account;
|
pub use crate::accounts::account::Account;
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[allow(deprecated)]
|
||||||
|
pub use crate::accounts::cpi_account::CpiAccount;
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[allow(deprecated)]
|
||||||
|
pub use crate::accounts::cpi_state::CpiState;
|
||||||
|
#[allow(deprecated)]
|
||||||
|
pub use crate::accounts::loader::Loader;
|
||||||
|
pub use crate::accounts::loader_account::AccountLoader;
|
||||||
|
pub use crate::accounts::program::Program;
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[allow(deprecated)]
|
||||||
|
pub use crate::accounts::program_account::ProgramAccount;
|
||||||
|
pub use crate::accounts::signer::Signer;
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[allow(deprecated)]
|
||||||
|
pub use crate::accounts::state::ProgramState;
|
||||||
|
pub use crate::accounts::system_account::SystemAccount;
|
||||||
|
pub use crate::accounts::sysvar::Sysvar;
|
||||||
|
pub use crate::accounts::unchecked_account::UncheckedAccount;
|
||||||
|
pub use crate::system_program::System;
|
||||||
|
mod vec;
|
||||||
pub use crate::bpf_upgradeable_state::*;
|
pub use crate::bpf_upgradeable_state::*;
|
||||||
#[doc(hidden)]
|
#[doc(hidden)]
|
||||||
#[allow(deprecated)]
|
#[allow(deprecated)]
|
||||||
pub use crate::context::CpiStateContext;
|
pub use crate::context::CpiStateContext;
|
||||||
pub use crate::context::{Context, CpiContext};
|
pub use crate::context::{Context, CpiContext};
|
||||||
#[doc(hidden)]
|
|
||||||
#[allow(deprecated)]
|
|
||||||
pub use crate::cpi_account::CpiAccount;
|
|
||||||
#[doc(hidden)]
|
|
||||||
#[allow(deprecated)]
|
|
||||||
pub use crate::cpi_state::CpiState;
|
|
||||||
#[allow(deprecated)]
|
|
||||||
pub use crate::loader::Loader;
|
|
||||||
pub use crate::loader_account::AccountLoader;
|
|
||||||
pub use crate::program::Program;
|
|
||||||
#[doc(hidden)]
|
|
||||||
#[allow(deprecated)]
|
|
||||||
pub use crate::program_account::ProgramAccount;
|
|
||||||
pub use crate::signer::Signer;
|
|
||||||
#[doc(hidden)]
|
|
||||||
#[allow(deprecated)]
|
|
||||||
pub use crate::state::ProgramState;
|
|
||||||
pub use crate::system_account::SystemAccount;
|
|
||||||
pub use crate::system_program::System;
|
|
||||||
pub use crate::sysvar::Sysvar;
|
|
||||||
pub use crate::unchecked_account::UncheckedAccount;
|
|
||||||
pub use anchor_attribute_access_control::access_control;
|
pub use anchor_attribute_access_control::access_control;
|
||||||
pub use anchor_attribute_account::{account, declare_id, zero_copy};
|
pub use anchor_attribute_account::{account, declare_id, zero_copy};
|
||||||
pub use anchor_attribute_constant::constant;
|
pub use anchor_attribute_constant::constant;
|
||||||
|
@ -262,7 +249,10 @@ pub mod prelude {
|
||||||
};
|
};
|
||||||
|
|
||||||
#[allow(deprecated)]
|
#[allow(deprecated)]
|
||||||
pub use super::{CpiAccount, CpiState, CpiStateContext, Loader, ProgramAccount, ProgramState};
|
pub use super::{
|
||||||
|
accounts::cpi_account::CpiAccount, accounts::cpi_state::CpiState, accounts::loader::Loader,
|
||||||
|
accounts::program_account::ProgramAccount, accounts::state::ProgramState, CpiStateContext,
|
||||||
|
};
|
||||||
|
|
||||||
pub use borsh;
|
pub use borsh;
|
||||||
pub use solana_program::account_info::{next_account_info, AccountInfo};
|
pub use solana_program::account_info::{next_account_info, AccountInfo};
|
||||||
|
@ -299,7 +289,7 @@ pub mod __private {
|
||||||
pub use bytemuck;
|
pub use bytemuck;
|
||||||
|
|
||||||
pub mod state {
|
pub mod state {
|
||||||
pub use crate::state::*;
|
pub use crate::accounts::state::*;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The starting point for user defined error codes.
|
// The starting point for user defined error codes.
|
||||||
|
@ -327,7 +317,7 @@ pub mod __private {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub use crate::state::PROGRAM_STATE_SEED;
|
pub use crate::accounts::state::PROGRAM_STATE_SEED;
|
||||||
pub const CLOSED_ACCOUNT_DISCRIMINATOR: [u8; 8] = [255, 255, 255, 255, 255, 255, 255, 255];
|
pub const CLOSED_ACCOUNT_DISCRIMINATOR: [u8; 8] = [255, 255, 255, 255, 255, 255, 255, 255];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue