Remove Entrypoint type

This commit is contained in:
Michael Vines
2020-10-29 16:17:36 -07:00
parent 2664a1f7ef
commit 225bed11c7
13 changed files with 98 additions and 163 deletions

View File

@ -1,4 +1,4 @@
use solana_runtime::bank::{Builtin, Builtins, Entrypoint};
use solana_runtime::bank::{Builtin, Builtins};
use solana_sdk::{feature_set, genesis_config::ClusterType, pubkey::Pubkey};
/// Builtin programs that are always available
@ -16,7 +16,7 @@ fn genesis_builtins(cluster_type: ClusterType) -> Vec<Builtin> {
builtins
.into_iter()
.map(|b| Builtin::new(&b.0, b.1, Entrypoint::Loader(b.2)))
.map(|b| Builtin::new(&b.0, b.1, b.2))
.collect()
}
@ -29,7 +29,7 @@ fn feature_builtins() -> Vec<(Builtin, Pubkey)> {
builtins
.into_iter()
.map(|(b, p)| (Builtin::new(&b.0, b.1, Entrypoint::Loader(b.2)), p))
.map(|(b, p)| (Builtin::new(&b.0, b.1, b.2), p))
.collect()
}