Skip to content

Commit

Permalink
replace solana_sdk::pubkey with solana_pubkey in transaction-status (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinheavey authored Jan 3, 2025
1 parent aa1f0c8 commit 062f86e
Show file tree
Hide file tree
Showing 20 changed files with 21 additions and 17 deletions.
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions programs/sbf/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions svm/examples/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions transaction-status/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ serde = { workspace = true }
serde_derive = { workspace = true }
serde_json = { workspace = true }
solana-account-decoder = { workspace = true }
solana-pubkey = { workspace = true }
solana-sdk = { workspace = true }
solana-transaction-status-client-types = { workspace = true }
spl-associated-token-account = { workspace = true, features = ["no-entrypoint"] }
Expand Down
4 changes: 2 additions & 2 deletions transaction-status/src/extract_memos.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ use {
};

// A helper function to convert spl_memo::v1::id() as spl_sdk::pubkey::Pubkey to
// solana_sdk::pubkey::Pubkey
// solana_pubkey::Pubkey
pub fn spl_memo_id_v1() -> Pubkey {
*MEMO_PROGRAM_ID_V1
}

// A helper function to convert spl_memo::id() as spl_sdk::pubkey::Pubkey to
// solana_sdk::pubkey::Pubkey
// solana_pubkey::Pubkey
pub fn spl_memo_id_v3() -> Pubkey {
*MEMO_PROGRAM_ID_V3
}
Expand Down
2 changes: 1 addition & 1 deletion transaction-status/src/parse_associated_token.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use {
};

// A helper function to convert spl_associated_token_account::id() as spl_sdk::pubkey::Pubkey
// to solana_sdk::pubkey::Pubkey
// to solana_pubkey::Pubkey
pub fn spl_associated_token_id() -> Pubkey {
Pubkey::new_from_array(spl_associated_token_account::id().to_bytes())
}
Expand Down
2 changes: 1 addition & 1 deletion transaction-status/src/parse_token.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1782,7 +1782,7 @@ mod test {
}

fn test_token_ix_not_enough_keys(program_id: &Pubkey) {
let keys: Vec<Pubkey> = repeat_with(solana_sdk::pubkey::new_rand).take(10).collect();
let keys: Vec<Pubkey> = repeat_with(solana_pubkey::new_rand).take(10).collect();

// Test InitializeMint variations
let initialize_mint_ix =
Expand Down
2 changes: 1 addition & 1 deletion transaction-status/src/parse_token/extension/cpi_guard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub(in crate::parse_token) fn parse_cpi_guard_instruction(
mod test {
use {
super::*,
solana_sdk::pubkey::Pubkey,
solana_pubkey::Pubkey,
spl_token_2022::{
extension::cpi_guard::instruction::{disable_cpi_guard, enable_cpi_guard},
solana_program::message::Message,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ pub(in crate::parse_token) fn parse_default_account_state_instruction(
mod test {
use {
super::*,
solana_sdk::pubkey::Pubkey,
solana_pubkey::Pubkey,
spl_token_2022::{
extension::default_account_state::instruction::{
initialize_default_account_state, update_default_account_state,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pub(in crate::parse_token) fn parse_group_member_pointer_instruction(

#[cfg(test)]
mod test {
use {super::*, solana_sdk::pubkey::Pubkey, spl_token_2022::solana_program::message::Message};
use {super::*, solana_pubkey::Pubkey, spl_token_2022::solana_program::message::Message};

#[test]
fn test_parse_group_member_pointer_instruction() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ pub(in crate::parse_token) fn parse_group_pointer_instruction(

#[cfg(test)]
mod test {
use {super::*, solana_sdk::pubkey::Pubkey, spl_token_2022::solana_program::message::Message};
use {super::*, solana_pubkey::Pubkey, spl_token_2022::solana_program::message::Message};

#[test]
fn test_parse_group_pointer_instruction() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub(in crate::parse_token) fn parse_memo_transfer_instruction(
mod test {
use {
super::*,
solana_sdk::pubkey::Pubkey,
solana_pubkey::Pubkey,
spl_token_2022::{
extension::memo_transfer::instruction::{
disable_required_transfer_memos, enable_required_transfer_memos,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pub(in crate::parse_token) fn parse_metadata_pointer_instruction(

#[cfg(test)]
mod test {
use {super::*, solana_sdk::pubkey::Pubkey, spl_token_2022::solana_program::message::Message};
use {super::*, solana_pubkey::Pubkey, spl_token_2022::solana_program::message::Message};

#[test]
fn test_parse_metadata_pointer_instruction() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ mod test {
use {
super::*,
serde_json::Value,
solana_sdk::pubkey::Pubkey,
solana_pubkey::Pubkey,
spl_token_2022::{instruction::*, solana_program::message::Message},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pub(in crate::parse_token) fn parse_initialize_permanent_delegate_instruction(
mod test {
use {
super::*,
solana_sdk::pubkey::Pubkey,
solana_pubkey::Pubkey,
spl_token_2022::{instruction::*, solana_program::message::Message},
};

Expand Down
2 changes: 1 addition & 1 deletion transaction-status/src/parse_token/extension/reallocate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pub(in crate::parse_token) fn parse_reallocate_instruction(
mod test {
use {
super::*,
solana_sdk::pubkey::Pubkey,
solana_pubkey::Pubkey,
spl_token_2022::{instruction::reallocate, solana_program::message::Message},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pub(in crate::parse_token) fn parse_token_group_instruction(

#[cfg(test)]
mod test {
use {super::*, solana_sdk::pubkey::Pubkey, spl_token_2022::solana_program::message::Message};
use {super::*, solana_pubkey::Pubkey, spl_token_2022::solana_program::message::Message};

#[test]
fn test_parse_token_group_instruction() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ pub(in crate::parse_token) fn parse_token_metadata_instruction(

#[cfg(test)]
mod test {
use {super::*, solana_sdk::pubkey::Pubkey, spl_token_2022::solana_program::message::Message};
use {super::*, solana_pubkey::Pubkey, spl_token_2022::solana_program::message::Message};

#[test]
fn test_parse_token_metadata_instruction() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ pub(in crate::parse_token) fn parse_transfer_fee_instruction(
mod test {
use {
super::*,
solana_sdk::pubkey::Pubkey,
solana_pubkey::Pubkey,
spl_token_2022::{
extension::transfer_fee::instruction::*, solana_program::message::Message,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ pub(in crate::parse_token) fn parse_transfer_hook_instruction(

#[cfg(test)]
mod test {
use {super::*, solana_sdk::pubkey::Pubkey, spl_token_2022::solana_program::message::Message};
use {super::*, solana_pubkey::Pubkey, spl_token_2022::solana_program::message::Message};

#[test]
fn test_parse_transfer_hook_instruction() {
Expand Down

0 comments on commit 062f86e

Please sign in to comment.