Skip to content

Commit

Permalink
fix deps
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinheavey committed Dec 19, 2024
1 parent 4004900 commit 90d6bdf
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 19 deletions.
3 changes: 3 additions & 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.

5 changes: 4 additions & 1 deletion runtime-transaction/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ solana-sdk-ids = { workspace = true }
solana-signature = { workspace = true }
solana-svm-transaction = { workspace = true }
solana-transaction = { workspace = true }
solana-transaction-error = { workspace = true }
thiserror = { workspace = true }

[lib]
Expand All @@ -33,11 +34,13 @@ criterion = { workspace = true }
rand = { workspace = true }
solana-compute-budget-instruction = { workspace = true, features = ["dev-context-only-utils"] }
solana-compute-budget-interface = { workspace = true }
solana-feature-set = { workspace = true }
solana-instruction = { workspace = true }
solana-keypair = { workspace = true }
solana-program = { workspace = true }
solana-reserved-account-keys = { workspace = true }
solana-signer = { workspace = true }
solana-system-interface = { workspace = true, features = ["bincode"]}
solana-system-interface = { workspace = true, features = ["bincode"] }
solana-system-transaction = { workspace = true }

[package.metadata.docs.rs]
Expand Down
8 changes: 4 additions & 4 deletions runtime-transaction/benches/get_signature_details.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ fn bench_get_signature_details_no_sigs_unique(c: &mut Criterion) {

fn bench_get_signature_details_packed_sigs(c: &mut Criterion) {
let program_ids = [
solana_sdk::secp256k1_program::id(),
solana_sdk::ed25519_program::id(),
solana_sdk_ids::secp256k1_program::id(),
solana_sdk_ids::ed25519_program::id(),
];
for num_instructions in [4, 64] {
let instructions = (0..num_instructions)
Expand Down Expand Up @@ -87,8 +87,8 @@ fn bench_get_signature_details_packed_sigs(c: &mut Criterion) {

fn bench_get_signature_details_mixed_sigs(c: &mut Criterion) {
let program_ids = [
solana_sdk::secp256k1_program::id(),
solana_sdk::ed25519_program::id(),
solana_sdk_ids::secp256k1_program::id(),
solana_sdk_ids::ed25519_program::id(),
]
.into_iter()
.chain((0..6).map(|_| Pubkey::new_unique()))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ use {
solana_pubkey::Pubkey,
solana_svm_transaction::instruction::SVMInstruction,
solana_transaction::{
sanitized::SanitizedTransaction,
sanitized::{MessageHash, SanitizedTransaction},
simple_vote_transaction_checker::is_simple_vote_transaction,
versioned::{sanitized::SanitizedVersionedTransaction, VersionedTransaction},
MessageHash,
},
solana_transaction_error::TransactionResult as Result,
std::{borrow::Cow, collections::HashSet},
Expand Down Expand Up @@ -159,12 +158,12 @@ mod tests {
solana_hash::Hash,
solana_instruction::Instruction,
solana_keypair::Keypair,
solana_message::Message,
solana_message::{Message, SimpleAddressLoader},
solana_program::vote::{self, state::Vote},
solana_reserved_account_keys::ReservedAccountKeys,
solana_signer::Signer,
solana_system_interface::instruction as system_instruction,
solana_transaction::{versioned::VersionedTransaction, SimpleAddressLoader, Transaction},
solana_transaction::{versioned::VersionedTransaction, Transaction},
};

fn vote_sanitized_versioned_transaction() -> SanitizedVersionedTransaction {
Expand Down
11 changes: 7 additions & 4 deletions runtime-transaction/src/runtime_transaction/transaction_view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ use {
solana_pubkey::Pubkey,
solana_svm_transaction::svm_message::SVMMessage,
solana_transaction::{
simple_vote_transaction_checker::is_simple_vote_transaction_impl, MessageHash, Result,
SanitizedTransaction, TransactionError, VersionedTransaction,
sanitized::{MessageHash, SanitizedTransaction},
simple_vote_transaction_checker::is_simple_vote_transaction_impl,
versioned::VersionedTransaction,
},
solana_transaction_error::{TransactionError, TransactionResult as Result},
std::{borrow::Cow, collections::HashSet},
};

Expand Down Expand Up @@ -191,10 +193,11 @@ mod tests {
use {
super::*,
solana_hash::Hash,
solana_keypair::Keypair,
solana_message::{v0, AddressLookupTableAccount, SimpleAddressLoader},
solana_reserved_account_keys::ReservedAccountKeys,
solana_signature::{Keypair, Signature},
solana_solana_system_interface::instruction as system_instruction,
solana_signature::Signature,
solana_system_interface::instruction as system_instruction,
solana_system_transaction as system_transaction,
};

Expand Down
12 changes: 6 additions & 6 deletions runtime-transaction/src/signature_details.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ impl SignatureDetailsFilter {

#[inline]
fn check_program_id(program_id: &Pubkey) -> ProgramIdStatus {
if program_id == &solana_sdk::secp256k1_program::ID {
if program_id == &solana_sdk_ids::secp256k1_program::ID {
ProgramIdStatus::Secp256k1
} else if program_id == &solana_sdk::ed25519_program::ID {
} else if program_id == &solana_sdk_ids::ed25519_program::ID {
ProgramIdStatus::Ed25519
} else if program_id == &solana_sdk_ids::secp256r1_program::ID {
ProgramIdStatus::Secp256r1
Expand Down Expand Up @@ -148,8 +148,8 @@ mod tests {
fn test_get_signature_details_signatures_mixed() {
let program_ids = [
Pubkey::new_unique(),
solana_sdk::secp256k1_program::ID,
solana_sdk::ed25519_program::ID,
solana_sdk_ids::secp256k1_program::ID,
solana_sdk_ids::ed25519_program::ID,
solana_sdk_ids::secp256r1_program::ID,
];
let instructions = [
Expand All @@ -172,8 +172,8 @@ mod tests {
#[test]
fn test_get_signature_details_missing_num_signatures() {
let program_ids = [
solana_sdk::secp256k1_program::ID,
solana_sdk::ed25519_program::ID,
solana_sdk_ids::secp256k1_program::ID,
solana_sdk_ids::ed25519_program::ID,
solana_sdk_ids::secp256r1_program::ID,
];
let instructions = [
Expand Down
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.

0 comments on commit 90d6bdf

Please sign in to comment.