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

Avoid spl-sdk dependency, which inhibits crate publishing

Browse Source
This commit is contained in:
Michael Vines
2020-07-30 14:52:28 -07:00
committed by mergify[bot]
parent 1d2426ddbc
commit c78e12a262
5 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
account-decoder/Cargo.toml
View File

@ -15,8 +15,7 @@ Inflector = "0.11.4"
lazy_static = "1.4.0"
solana-sdk = { path = "../sdk", version = "1.3.0" }
solana-vote-program = { path = "../programs/vote", version = "1.3.0" }
spl-sdk = { package = "solana-sdk", version = "=1.2.13", default-features = false }
spl-token-v1-0 = { package = "spl-token", version = "1.0.2", features = ["skip-no-mangle"] }
spl-token-v1-0 = { package = "spl-token", version = "1.0.3", features = ["skip-no-mangle"] }
serde = "1.0.112"
serde_derive = "1.0.103"
serde_json = "1.0.56"

16
account-decoder/src/parse_token.rs
View File

@ -1,8 +1,8 @@
use crate::parse_account_data::{ParsableAccount, ParseAccountError};
use solana_sdk::pubkey::Pubkey;
use spl_sdk::pubkey::Pubkey as SplPubkey;
use spl_token_v1_0::{
option::COption,
solana_sdk::pubkey::Pubkey as SplTokenPubkey,
state::{Account, Mint, Multisig, State},
};
use std::{mem::size_of, str::FromStr};
@ -51,7 +51,7 @@ pub fn parse_token(data: &[u8]) -> Result<TokenAccountType, ParseAccountError> {
.signers
.iter()
.filter_map(|pubkey| {
if pubkey != &SplPubkey::default() {
if pubkey != &SplTokenPubkey::default() {
Some(pubkey.to_string())
} else {
None
@ -109,8 +109,8 @@ mod test {
#[test]
fn test_parse_token() {
let mint_pubkey = SplPubkey::new(&[2; 32]);
let owner_pubkey = SplPubkey::new(&[3; 32]);
let mint_pubkey = SplTokenPubkey::new(&[2; 32]);
let owner_pubkey = SplTokenPubkey::new(&[3; 32]);
let mut account_data = [0; size_of::<Account>()];
let mut account: &mut Account = State::unpack_unchecked(&mut account_data).unwrap();
account.mint = mint_pubkey;
@ -144,12 +144,12 @@ mod test {
}),
);
let signer1 = SplPubkey::new(&[1; 32]);
let signer2 = SplPubkey::new(&[2; 32]);
let signer3 = SplPubkey::new(&[3; 32]);
let signer1 = SplTokenPubkey::new(&[1; 32]);
let signer2 = SplTokenPubkey::new(&[2; 32]);
let signer3 = SplTokenPubkey::new(&[3; 32]);
let mut multisig_data = [0; size_of::<Multisig>()];
let mut multisig: &mut Multisig = State::unpack_unchecked(&mut multisig_data).unwrap();
let mut signers = [SplPubkey::default(); 11];
let mut signers = [SplTokenPubkey::default(); 11];
signers[0] = signer1;
signers[1] = signer2;
signers[2] = signer3;