This repository was archived by the owner on Jan 22, 2025. It is now read-only.
Port BPFLoader2 activation to FeatureSet#12490
Merged
mvines merged 3 commits intosolana-labs:masterfrom Sep 28, 2020
Merged
Conversation
jackcmay
reviewed
Sep 25, 2020
mvines
force-pushed
the
bpf
branch
3 times, most recently
from
a983aa8 to
46d5e70
Compare
mvines
added
CI
mvines
force-pushed
the
bpf
branch
2 times, most recently
from
0fc24d0 to
ac48fe9
Compare
Contributor
Author
|
Ugh, getting stuck on |
mvines
force-pushed
the
bpf
branch
5 times, most recently
from
db984cf to
8522024
Compare
Codecov Report
@@ Coverage Diff @@
## master #12490 +/- ##
=========================================
- Coverage 82.1% 82.0% -0.1%
=========================================
Files 354 354
Lines 82868 82624 -244
=========================================
- Hits 68037 67785 -252
- Misses 14831 14839 +8 |
ryoqun
reviewed
Sep 27, 2020
| } | ||
|
|
||
| #[cfg(RUSTC_WITH_SPECIALIZATION)] | ||
| impl AbiExample for Builtin { |
mvines
force-pushed
the
bpf
branch
2 times, most recently
from
db252ba to
f6654a2
Compare
jackcmay
reviewed
Sep 28, 2020
|
|
||
| builtins | ||
| .into_iter() | ||
| .map(|(b, p)| (Builtin::new(&b.0, b.1, Entrypoint::Loader(b.2)), p)) |
Contributor
There was a problem hiding this comment.
declare_builtin should probably be a struct so we don't have reference it via tuple indexes. If agreed we can do it a different PR
Contributor
There was a problem hiding this comment.
Or just expand out the map to:
.map(|((name, id, entrypoint), p)| (Builtin::new(&b.name, b.id, Entrypoint::Loader(b.entrypoint)), p))
Contributor
Author
There was a problem hiding this comment.
declare_builtin should probably be a struct so we don't have reference it via tuple indexes. If agreed we can do it a different PR
Yeah I agree that'll be much nicer. I didn't want to take on that churn in this PR
jackcmay
reviewed
Sep 28, 2020
Contributor
Author
|
Looks good otherwise @jackcmay? |
mergify Bot
added a commit
that referenced
this pull request
Sep 28, 2020
* Cargo.lock (cherry picked from commit 6071d0d) # Conflicts: # Cargo.lock * Port BPFLoader2 activation to FeatureSet and rework built-in program activation (cherry picked from commit 31696a1) # Conflicts: # core/Cargo.toml # genesis-programs/Cargo.toml # genesis/Cargo.toml # ledger/Cargo.toml # local-cluster/Cargo.toml # runtime/src/bank.rs * Add Builtin AbiExample (cherry picked from commit 833ad20) * Rebase Co-authored-by: Michael Vines <mvines@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Along the way delete genesis-programs/ and the Bank's EnteredEpochCallback, significantly cleaning up how built-in programs are added and activated.