gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move Account to solana-sdk (#13198)

Browse Source
This commit is contained in:
Jack May
2020-10-28 22:01:07 -07:00
committed by GitHub
parent d5e439037b
commit c458d4b213
38 changed files with 460 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/rpc.rs
View File

@ -55,7 +55,7 @@ use solana_sdk::{
signature::Signature,
stake_history::StakeHistory,
system_instruction,
sysvar::{stake_history, Sysvar},
sysvar::stake_history,
transaction::{self, Transaction},
};
use solana_stake_program::stake_state::StakeState;
@ -1036,7 +1036,8 @@ impl JsonRpcRequestProcessor {
.get_account(&stake_history::id())
.ok_or_else(Error::internal_error)?;
let stake_history =
StakeHistory::from_account(&stake_history_account).ok_or_else(Error::internal_error)?;
solana_sdk::account::from_account::<StakeHistory>(&stake_history_account)
.ok_or_else(Error::internal_error)?;
let (active, activating, deactivating) =
delegation.stake_activating_and_deactivating(epoch, Some(&stake_history));

4
core/src/transaction_status_service.rs
View File

@ -5,7 +5,7 @@ use solana_runtime::{
bank::{Bank, HashAgeKind},
transaction_utils::OrderedIterator,
};
use solana_sdk::nonce;
use solana_sdk::nonce_account;
use solana_transaction_status::{InnerInstructions, TransactionStatusMeta};
use std::{
sync::{
@ -78,7 +78,7 @@ impl TransactionStatusService {
if Bank::can_commit(&status) && !transaction.signatures.is_empty() {
let fee_calculator = match hash_age_kind {
Some(HashAgeKind::DurableNonce(_, account)) => {
nonce::utils::fee_calculator_of(&account)
nonce_account::fee_calculator_of(&account)
}
_ => bank.get_fee_calculator(&transaction.message().recent_blockhash),
}