* Move types to more appropriate files (#10638)
(cherry picked from commit dac7dc2f10
)
# Conflicts:
# programs/stake/src/stake_instruction.rs
# programs/vote/src/vote_instruction.rs
# sdk/src/system_instruction.rs
* Fix conflicts
* bump lock
Co-authored-by: Jack May <jack@solana.com>
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
use log::*;
|
||||
use solana_sdk::{
|
||||
account::{get_signers, Account, KeyedAccount},
|
||||
account::{get_signers, next_keyed_account, Account, KeyedAccount},
|
||||
instruction::InstructionError,
|
||||
nonce::Account as NonceAccount,
|
||||
program_utils::{limited_deserialize, next_keyed_account},
|
||||
program_utils::limited_deserialize,
|
||||
pubkey::Pubkey,
|
||||
system_instruction::{SystemError, SystemInstruction, MAX_PERMITTED_DATA_LENGTH},
|
||||
system_program,
|
||||
|
@@ -6,10 +6,10 @@ use libloading::os::windows::*;
|
||||
use log::*;
|
||||
use num_derive::{FromPrimitive, ToPrimitive};
|
||||
use solana_sdk::{
|
||||
account::KeyedAccount,
|
||||
account::{next_keyed_account, KeyedAccount},
|
||||
decode_error::DecodeError,
|
||||
entrypoint_native::{InvokeContext, LoaderEntrypoint, ProgramEntrypoint},
|
||||
instruction::InstructionError,
|
||||
program_utils::{next_keyed_account, DecodeError},
|
||||
pubkey::Pubkey,
|
||||
};
|
||||
use std::{collections::HashMap, env, path::PathBuf, str, sync::RwLock};
|
||||
|
@@ -1,10 +1,10 @@
|
||||
use log::*;
|
||||
use solana_sdk::{
|
||||
account::{get_signers, Account, KeyedAccount},
|
||||
account::{get_signers, next_keyed_account, Account, KeyedAccount},
|
||||
account_utils::StateMut,
|
||||
instruction::InstructionError,
|
||||
nonce::{self, Account as NonceAccount},
|
||||
program_utils::{limited_deserialize, next_keyed_account},
|
||||
program_utils::limited_deserialize,
|
||||
pubkey::Pubkey,
|
||||
system_instruction::{SystemError, SystemInstruction, MAX_PERMITTED_DATA_LENGTH},
|
||||
system_program,
|
||||
|
Reference in New Issue
Block a user