Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ solana-clap-utils = "1.14.*"
solana-cli-config = "1.14.*"
solana-client = "1.14.*"
solana-logger ="1.14.*"
solana-remote-wallet = "1.14.*"
solana-remote-wallet = { version = "1.14.*", optional = true }
solana-sdk = "1.14.*"
tokio = { version = "1", features = ["full"] }
thiserror = "1.0"
Expand All @@ -38,4 +38,8 @@ assert_cmd = "2.0"
predicates = "3.0"
tempfile = "3.8"
serial_test = "2.0"
mockito = "1.2"
mockito = "1.2"

[features]
default = []
remote-wallet = ["solana-remote-wallet"]
27 changes: 5 additions & 22 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,15 @@ use {
solana_remote_wallet::remote_wallet::RemoteWalletManager,
solana_sdk::{
commitment_config::CommitmentConfig,
instruction::AccountMeta,
native_token::Sol,
signature::{Keypair, Signer},
signature::Signer,
},
std::{env, process::exit, sync::Arc},
};
pub mod clparse;
pub mod prelude;
pub mod utils;

/// Space allocated for account state
const ACCOUNT_STATE_SPACE: usize = 1024;

struct Config {
commitment_config: CommitmentConfig,
default_signer: Box<dyn Signer>,
Expand Down Expand Up @@ -727,20 +723,6 @@ mod test {

use {super::*, solana_test_validator::*};

// Tests commented out as they depend on removed functions
/*
#[test]
fn test_ping() {
let (test_validator, payer) = TestValidatorGenesis::default().start();
let rpc_client = test_validator.get_rpc_client();

assert!(matches!(
ping_instruction(&rpc_client, &payer, CommitmentConfig::confirmed()),
Ok(_)
));
}
*/

#[test]
fn test_borsh() {
#[repr(C)]
Expand All @@ -756,8 +738,9 @@ mod test {
primary_sale_happened: Some(true),
};
let bout = faux.try_to_vec().unwrap();
println!("{:?}", bout);
let in_faux = UpdateMetadataAccountArgs::try_from_slice(&bout).unwrap();
println!("{:?}", in_faux);

// Assert that the deserialized data matches the original
assert_eq!(faux, in_faux);
}
}
}
Loading