From d56206687aaf64aaea17f96c59bff99699fadd4d Mon Sep 17 00:00:00 2001 From: Joe Caulfield Date: Fri, 3 Jan 2025 09:39:01 +0000 Subject: [PATCH] core-bpf: fix builtins list removal step --- macro/src/lib.rs | 3 --- src/lib.rs | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/macro/src/lib.rs b/macro/src/lib.rs index 0a0e485..0b21005 100644 --- a/macro/src/lib.rs +++ b/macro/src/lib.rs @@ -79,9 +79,6 @@ pub fn load_core_bpf_program(_: TokenStream) -> TokenStream { .unwrap(), ), ); - - // Remove the builtin ID from the `builtins` hash set. - builtins.remove(&target_program_id); } .into(); } diff --git a/src/lib.rs b/src/lib.rs index 9b2f1bd..efe14a9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -559,9 +559,8 @@ fn load_builtins(cache: &mut ProgramCacheForTxBatch, feature_set: &FeatureSet) { } // If the `CORE_BPF_PROGRAM_ID` and `CORE_BPF_TARGET` environment variables - // are set, this macro will do the following: - // * Replace the designated builtin program in the cache with a loaded ELF. - // * Remove that builtin's program ID from the `builtins` set above. + // are set, this macro will replace the designated builtin program in the + // cache with a loaded ELF. load_core_bpf_program!(); }