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

fix cross-merge (#16535)

Browse Source
This commit is contained in:
Jack May
2021-04-14 03:16:24 -07:00
committed by GitHub
parent 6da4bec41d
commit ef3781d4ee
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
programs/bpf_loader/src/syscalls.rs
View File

@ -2664,7 +2664,7 @@ mod tests {
let got_clock = Clock::default(); let got_clock = Clock::default();
let got_clock_va = 2048; let got_clock_va = 2048;
let memory_mapping = MemoryMapping::new( let memory_mapping = MemoryMapping::new::<UserError>(
vec![MemoryRegion { vec![MemoryRegion {
host_addr: &got_clock as *const _ as u64, host_addr: &got_clock as *const _ as u64,
vm_addr: got_clock_va, vm_addr: got_clock_va,
@ -2673,7 +2673,8 @@ mod tests {
is_writable: true, is_writable: true,
}], }],
&DEFAULT_CONFIG, &DEFAULT_CONFIG,
); )
.unwrap();
let src_clock = Clock { let src_clock = Clock {
slot: 1, slot: 1,
@ -2705,7 +2706,7 @@ mod tests {
let got_epochschedule = EpochSchedule::default(); let got_epochschedule = EpochSchedule::default();
let got_epochschedule_va = 2048; let got_epochschedule_va = 2048;
let memory_mapping = MemoryMapping::new( let memory_mapping = MemoryMapping::new::<UserError>(
vec![MemoryRegion { vec![MemoryRegion {
host_addr: &got_epochschedule as *const _ as u64, host_addr: &got_epochschedule as *const _ as u64,
vm_addr: got_epochschedule_va, vm_addr: got_epochschedule_va,
@ -2714,7 +2715,8 @@ mod tests {
is_writable: true, is_writable: true,
}], }],
&DEFAULT_CONFIG, &DEFAULT_CONFIG,
); )
.unwrap();
let src_epochschedule = EpochSchedule { let src_epochschedule = EpochSchedule {
slots_per_epoch: 1, slots_per_epoch: 1,
@ -2754,7 +2756,7 @@ mod tests {
let got_fees = Fees::default(); let got_fees = Fees::default();
let got_fees_va = 2048; let got_fees_va = 2048;
let memory_mapping = MemoryMapping::new( let memory_mapping = MemoryMapping::new::<UserError>(
vec![MemoryRegion { vec![MemoryRegion {
host_addr: &got_fees as *const _ as u64, host_addr: &got_fees as *const _ as u64,
vm_addr: got_fees_va, vm_addr: got_fees_va,
@ -2763,7 +2765,8 @@ mod tests {
is_writable: true, is_writable: true,
}], }],
&DEFAULT_CONFIG, &DEFAULT_CONFIG,
); )
.unwrap();
let src_fees = Fees { let src_fees = Fees {
fee_calculator: FeeCalculator { fee_calculator: FeeCalculator {
@ -2793,7 +2796,7 @@ mod tests {
let got_rent = Rent::default(); let got_rent = Rent::default();
let got_rent_va = 2048; let got_rent_va = 2048;
let memory_mapping = MemoryMapping::new( let memory_mapping = MemoryMapping::new::<UserError>(
vec![MemoryRegion { vec![MemoryRegion {
host_addr: &got_rent as *const _ as u64, host_addr: &got_rent as *const _ as u64,
vm_addr: got_rent_va, vm_addr: got_rent_va,
@ -2802,7 +2805,8 @@ mod tests {
is_writable: true, is_writable: true,
}], }],
&DEFAULT_CONFIG, &DEFAULT_CONFIG,
); )
.unwrap();
let src_rent = Rent { let src_rent = Rent {
lamports_per_byte_year: 1, lamports_per_byte_year: 1,