Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade sbf tests to use bpf loader v3 #34691

Merged
merged 22 commits into from
Jan 15, 2024

Conversation

HaoranYi
Copy link
Contributor

@HaoranYi HaoranYi commented Jan 8, 2024

Problem

Follow up #34194

Update programs/sbf/tests/programs.rs to use bpf_loader v3.

Summary of Changes

Fixes #

@HaoranYi HaoranYi force-pushed the 2024_jan_8_upgrade_bpf_test_v2 branch from 2bce7a9 to c8a66d0 Compare January 8, 2024 16:27
@HaoranYi HaoranYi force-pushed the 2024_jan_8_upgrade_bpf_test_v2 branch from c8a66d0 to 685423b Compare January 8, 2024 16:27
Copy link

codecov bot commented Jan 8, 2024

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (30fa449) 81.8% compared to head (1b19e87) 81.8%.
Report is 38 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #34691   +/-   ##
=======================================
  Coverage    81.8%    81.8%           
=======================================
  Files         824      824           
  Lines      222687   222687           
=======================================
+ Hits       182245   182303   +58     
+ Misses      40442    40384   -58     

@HaoranYi HaoranYi force-pushed the 2024_jan_8_upgrade_bpf_test_v2 branch from e5a2d37 to 6847c6c Compare January 8, 2024 18:39
@HaoranYi HaoranYi force-pushed the 2024_jan_8_upgrade_bpf_test_v2 branch from 6f27bf8 to d30de0d Compare January 8, 2024 19:35
@HaoranYi HaoranYi changed the title 2024 jan 8 upgrade bpf test v2 2024 jan 8 upgrade bpf test v3 Jan 10, 2024
@HaoranYi HaoranYi changed the title 2024 jan 8 upgrade bpf test v3 Upgrade spf tests to use bpf loader v3 Jan 11, 2024
@HaoranYi HaoranYi marked this pull request as ready for review January 11, 2024 16:11
@HaoranYi HaoranYi changed the title Upgrade spf tests to use bpf loader v3 Upgrade sbf tests to use bpf loader v3 Jan 11, 2024
@HaoranYi HaoranYi requested a review from pgarg66 January 11, 2024 20:28
@pgarg66
Copy link
Contributor

pgarg66 commented Jan 11, 2024

Looks good to me!
Leaving it open to give @Lichtso some time to review it as well.

@HaoranYi HaoranYi merged commit 8869d0c into solana-labs:master Jan 15, 2024
35 checks passed
@HaoranYi HaoranYi deleted the 2024_jan_8_upgrade_bpf_test_v2 branch January 15, 2024 00:20
@Lichtso Lichtso added the v1.17 PRs that should be backported to v1.17 label Feb 9, 2024
Copy link
Contributor

mergify bot commented Feb 9, 2024

Backports to the stable branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule.

mergify bot pushed a commit that referenced this pull request Feb 9, 2024
* update sbf test to use bpf_loader v2

* update test_program_sbf_invoke_sanity test

* update test bpf program owner

* update test_program_sbf_invoke_upgradeable_via_cpi

* update test_program_sbf_disguised_as_sbf_loader

* update test_program_reads_from_program_account

* update test_program_sbf_program_id_spoofing

* update test_program_sbf_caller_has_access_to_cpi_program

* update 3 more tests

* fix program buffer size in minimul for rent exempt calculation

* more test updates

* more update

* more test updates

* comments

* undo c format

* typo

* add sol_alloc_free not deployable and deployable tests

* comments

* review feedback - move buffer_keypair and program_keypair inside callee
fn.

* more refactor

* delete sof_alloc_free_syscall enabled tests

* revert lamport change

---------

Co-authored-by: HaoranYi <haoran.yi@solana.com>
(cherry picked from commit 8869d0c)

# Conflicts:
#	programs/sbf/tests/programs.rs
sakridge added a commit that referenced this pull request Feb 10, 2024
…35162)

* Upgrade sbf tests to use bpf loader v3 (#34691)

* update sbf test to use bpf_loader v2

* update test_program_sbf_invoke_sanity test

* update test bpf program owner

* update test_program_sbf_invoke_upgradeable_via_cpi

* update test_program_sbf_disguised_as_sbf_loader

* update test_program_reads_from_program_account

* update test_program_sbf_program_id_spoofing

* update test_program_sbf_caller_has_access_to_cpi_program

* update 3 more tests

* fix program buffer size in minimul for rent exempt calculation

* more test updates

* more update

* more test updates

* comments

* undo c format

* typo

* add sol_alloc_free not deployable and deployable tests

* comments

* review feedback - move buffer_keypair and program_keypair inside callee
fn.

* more refactor

* delete sof_alloc_free_syscall enabled tests

* revert lamport change

---------

Co-authored-by: HaoranYi <haoran.yi@solana.com>
(cherry picked from commit 8869d0c)

# Conflicts:
#	programs/sbf/tests/programs.rs

* fix merge conflicts

* update tests to avoid using the new test api from 1.18

* manually backport #34722 to fix a test

* Ignore failing benchmark tests and fix compilation

---------

Co-authored-by: HaoranYi <haoran.yi@gmail.com>
Co-authored-by: HaoranYi <haoran.yi@solana.com>
Co-authored-by: haoran <haoran@mbook>
Co-authored-by: Stephen Akridge <sakridge@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v1.17 PRs that should be backported to v1.17
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants