Skip to content

Commit 2bad57a

Browse files
authored
remove solana-program from clap-v3-utils (solana-labs#4364)
1 parent b63257c commit 2bad57a

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

Cargo.lock

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

clap-v3-utils/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ solana-clock = { workspace = true }
1717
solana-cluster-type = { workspace = true }
1818
solana-commitment-config = { workspace = true }
1919
solana-derivation-path = { workspace = true }
20-
solana-hash = { workspace = true }
20+
# the borsh feature is required to use the value_parser macro
21+
solana-hash = { workspace = true, features = ["borsh"] }
2122
solana-keypair = { workspace = true, features = ["seed-derivable"] }
23+
solana-message = { workspace = true }
2224
solana-native-token = { workspace = true }
2325
solana-presigner = { workspace = true }
24-
solana-program = { workspace = true }
2526
solana-pubkey = { workspace = true }
2627
solana-remote-wallet = { workspace = true, features = ["default"] }
2728
solana-seed-derivable = { workspace = true }
@@ -37,6 +38,7 @@ url = { workspace = true }
3738
[dev-dependencies]
3839
assert_matches = { workspace = true }
3940
solana-pubkey = { workspace = true, features = ["rand"] }
41+
solana-system-interface = { workspace = true, features = ["bincode"] }
4042
tempfile = { workspace = true }
4143

4244
[lib]

clap-v3-utils/src/keypair.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ use {
2121
solana_derivation_path::DerivationPath,
2222
solana_hash::Hash,
2323
solana_keypair::{read_keypair, read_keypair_file, Keypair},
24+
solana_message::Message,
2425
solana_presigner::Presigner,
25-
solana_program::message::Message,
2626
solana_pubkey::Pubkey,
2727
solana_remote_wallet::{
2828
remote_keypair::generate_remote_keypair,
@@ -1211,8 +1211,8 @@ mod tests {
12111211
crate::offline::OfflineArgs,
12121212
clap::{Arg, Command},
12131213
solana_keypair::write_keypair_file,
1214-
solana_program::system_instruction,
12151214
solana_remote_wallet::remote_wallet::initialize_wallet_manager,
1215+
solana_system_interface::instruction::transfer,
12161216
tempfile::TempDir,
12171217
};
12181218

@@ -1233,11 +1233,7 @@ mod tests {
12331233
let nonsigner2 = Keypair::new();
12341234
let recipient = Pubkey::new_unique();
12351235
let message = Message::new(
1236-
&[system_instruction::transfer(
1237-
&source.pubkey(),
1238-
&recipient,
1239-
42,
1240-
)],
1236+
&[transfer(&source.pubkey(), &recipient, 42)],
12411237
Some(&fee_payer.pubkey()),
12421238
);
12431239
let signers = vec![

0 commit comments

Comments
 (0)