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

Merge api/program into single units (#7061)

Browse Source
This commit is contained in:
Jack May
2019-11-20 16:32:19 -08:00
committed by GitHub
parent 186bf7ae32
commit 3415db9739
105 changed files with 224 additions and 4095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
programs/bpf/Cargo.toml
View File

@@ -22,7 +22,7 @@ walkdir = "2"
bincode = "1.1.4"
byteorder = "1.3.2"
elf = "0.0.10"
solana-bpf-loader-api = { path = "../bpf_loader_api", version = "0.21.0" }
solana-bpf-loader-program = { path = "../bpf_loader", version = "0.21.0" }
solana-logger = { path = "../../logger", version = "0.21.0" }
solana-runtime = { path = "../../runtime", version = "0.21.0" }
solana-sdk = { path = "../../sdk", version = "0.21.0" }

4
programs/bpf/benches/bpf_loader.rs
View File

@@ -60,7 +60,7 @@ fn bench_program_verify(bencher: &mut Bencher) {
vm.set_elf(&elf).unwrap();
bencher.iter(|| {
vm.set_verifier(solana_bpf_loader_api::bpf_verifier::check)
vm.set_verifier(solana_bpf_loader_program::bpf_verifier::check)
.unwrap();
});
}
@@ -76,7 +76,7 @@ fn bench_program_alu(bencher: &mut Bencher) {
inner_iter.write_u64::<LittleEndian>(0).unwrap();
let elf = load_elf().unwrap();
let (mut vm, _) = solana_bpf_loader_api::create_vm(&elf).unwrap();
let (mut vm, _) = solana_bpf_loader_program::create_vm(&elf).unwrap();
println!("Interpreted:");
assert_eq!(