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

Fix bad rebase

Browse Source
This commit is contained in:
Tyera Eulberg
2020-08-02 12:09:06 -06:00
parent f401ef7996
commit 0bc9bcc8b9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/rpc.rs
View File

@ -921,7 +921,7 @@ impl JsonRpcRequestProcessor {
get_filtered_program_accounts(&bank, &mint_account.owner, filters) get_filtered_program_accounts(&bank, &mint_account.owner, filters)
.map(|(address, account)| { .map(|(address, account)| {
let mut data = account.data.to_vec(); let mut data = account.data.to_vec();
let amount = TokenState::unpack(&mut data) let amount = spl_token_v1_0::state::unpack(&mut data)
.map(|account: &mut TokenAccount| account.amount) .map(|account: &mut TokenAccount| account.amount)
.unwrap_or(0); .unwrap_or(0);
RpcTokenAccountBalance { RpcTokenAccountBalance {
@ -4598,7 +4598,8 @@ pub mod tests {
// Add new_mint, and another token account on new_mint with different balance // Add new_mint, and another token account on new_mint with different balance
let mut mint_data = [0; size_of::<Mint>()]; let mut mint_data = [0; size_of::<Mint>()];
let mint_state: &mut Mint = TokenState::unpack_unchecked(&mut mint_data).unwrap(); let mint_state: &mut Mint =
spl_token_v1_0::state::unpack_unchecked(&mut mint_data).unwrap();
*mint_state = Mint { *mint_state = Mint {
owner: COption::Some(owner), owner: COption::Some(owner),
decimals: 2, decimals: 2,
@ -4615,7 +4616,8 @@ pub mod tests {
&mint_account, &mint_account,
); );
let mut account_data = [0; size_of::<TokenAccount>()]; let mut account_data = [0; size_of::<TokenAccount>()];
let account: &mut TokenAccount = TokenState::unpack_unchecked(&mut account_data).unwrap(); let account: &mut TokenAccount =
spl_token_v1_0::state::unpack_unchecked(&mut account_data).unwrap();
*account = TokenAccount { *account = TokenAccount {
mint: new_mint, mint: new_mint,
owner, owner,