gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Search for program files in 'target/deploy'

Browse Source
This commit is contained in:
Michael Vines
2020-11-04 20:33:42 -08:00
parent c988d0f573
commit d2b26a65e9
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
program-test/src/lib.rs
View File

@ -322,9 +322,9 @@ impl program_stubs::SyscallStubs for SyscallStubs {
} }
} }
fn find_file(filename: &str) -> Option<PathBuf> { fn find_file(filename: &str, search_path: &[PathBuf]) -> Option<PathBuf> {
for path in &["", "tests/fixtures"] { for path in search_path {
let candidate = Path::new(path).join(&filename); let candidate = path.join(&filename);
if candidate.exists() { if candidate.exists() {
return Some(candidate); return Some(candidate);
} }
@ -348,6 +348,7 @@ pub struct ProgramTest {
builtins: Vec<Builtin>, builtins: Vec<Builtin>,
bpf_compute_max_units: Option<u64>, bpf_compute_max_units: Option<u64>,
prefer_bpf: bool, prefer_bpf: bool,
search_path: Vec<PathBuf>,
} }
impl Default for ProgramTest { impl Default for ProgramTest {
@ -378,11 +379,22 @@ impl Default for ProgramTest {
Err(_err) => false, Err(_err) => false,
}; };
let mut search_path = vec![];
if let Ok(dir) = std::env::var("CARGO_BUILD_TARGET_DIR") {
let deploy_dir = PathBuf::from(dir).join("deploy");
search_path.push(deploy_dir);
};
if let Ok(dir) = std::env::current_dir() {
search_path.push(dir);
}
search_path.push(PathBuf::from("tests/fixtures"));
Self { Self {
accounts: vec![], accounts: vec![],
builtins: vec![], builtins: vec![],
bpf_compute_max_units: None, bpf_compute_max_units: None,
prefer_bpf, prefer_bpf,
search_path,
} }
} }
} }
@ -433,7 +445,7 @@ impl ProgramTest {
address, address,
Account { Account {
lamports, lamports,
data: read_file(find_file(filename).unwrap_or_else(|| { data: read_file(find_file(filename, &self.search_path).unwrap_or_else(|| {
panic!("Unable to locate {}", filename); panic!("Unable to locate {}", filename);
})), })),
owner, owner,
@ -479,7 +491,7 @@ impl ProgramTest {
process_instruction: Option<ProcessInstructionWithContext>, process_instruction: Option<ProcessInstructionWithContext>,
) { ) {
let loader = solana_program::bpf_loader::id(); let loader = solana_program::bpf_loader::id();
let program_file = find_file(&format!("{}.so", program_name)); let program_file = find_file(&format!("{}.so", program_name), &self.search_path);
if process_instruction.is_none() && program_file.is_none() { if process_instruction.is_none() && program_file.is_none() {
panic!("Unable to add program {} ({})", program_name, program_id); panic!("Unable to add program {} ({})", program_name, program_id);