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
core/Cargo.toml
View File

@@ -67,8 +67,7 @@ solana-transaction-status = { path = "../transaction-status", version = "1.3.0"
solana-version = { path = "../version", version = "1.3.0" }
solana-vote-program = { path = "../programs/vote", version = "1.3.0" }
solana-vote-signer = { path = "../vote-signer", 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"] }
tempfile = "3.1.0"
thiserror = "1.0"
tokio = "0.1"

13
core/src/rpc.rs
View File

@@ -2087,8 +2087,9 @@ pub mod tests {
vote_instruction,
vote_state::{Vote, VoteInit, MAX_LOCKOUT_HISTORY},
};
use spl_sdk::pubkey::Pubkey as SplPubkey;
use spl_token_v1_0::{option::COption, state::Mint};
use spl_token_v1_0::{
option::COption, solana_sdk::pubkey::Pubkey as SplTokenPubkey, state::Mint,
};
use std::collections::HashMap;
const TEST_MINT_LAMPORTS: u64 = 1_000_000;
@@ -4267,9 +4268,9 @@ pub mod tests {
let mut account_data = [0; size_of::<TokenAccount>()];
let account: &mut TokenAccount = TokenState::unpack_unchecked(&mut account_data).unwrap();
let mint = SplPubkey::new(&[2; 32]);
let owner = SplPubkey::new(&[3; 32]);
let delegate = SplPubkey::new(&[4; 32]);
let mint = SplTokenPubkey::new(&[2; 32]);
let owner = SplTokenPubkey::new(&[3; 32]);
let delegate = SplTokenPubkey::new(&[4; 32]);
*account = TokenAccount {
mint,
owner,
@@ -4349,7 +4350,7 @@ pub mod tests {
// Add another token account with the same owner and delegate but different mint
let mut account_data = [0; size_of::<TokenAccount>()];
let account: &mut TokenAccount = TokenState::unpack_unchecked(&mut account_data).unwrap();
let new_mint = SplPubkey::new(&[5; 32]);
let new_mint = SplTokenPubkey::new(&[5; 32]);
*account = TokenAccount {
mint: new_mint,
owner,