reuse builder in try_from

Author: apfitzge

compute-budget-instruction/src/compute_budget_instruction_details.rs

@@ -110,50 +110,13 @@ impl ComputeBudgetInstructionDetailsBuilder {
 
 impl ComputeBudgetInstructionDetails {
     pub fn try_from<'a>(
-        instructions: impl Iterator<Item = (&'a Pubkey, SVMInstruction<'a>)> + Clone,
+        instructions: impl Iterator<Item = (&'a Pubkey, SVMInstruction<'a>)>,
     ) -> Result<Self> {
-        let mut filter = ComputeBudgetProgramIdFilter::new();
-        let mut compute_budget_instruction_details = ComputeBudgetInstructionDetails::default();
-
-        for (i, (program_id, instruction)) in instructions.clone().enumerate() {
-            if filter.is_compute_budget_program(instruction.program_id_index as usize, program_id) {
-                compute_budget_instruction_details.process_instruction(i as u8, &instruction)?;
-            } else {
-                compute_budget_instruction_details.num_non_compute_budget_instructions += 1;
-            }
-        }
-
-        if compute_budget_instruction_details
-            .requested_compute_unit_limit
-            .is_none()
-        {
-            let mut filter = BuiltinProgramsFilter::new();
-            // reiterate to collect builtin details
-            for (program_id, instruction) in instructions {
-                match filter.get_program_kind(instruction.program_id_index as usize, program_id) {
-                    ProgramKind::Builtin => {
-                        compute_budget_instruction_details
-                            .num_non_migratable_builtin_instructions += 1;
-                    }
-                    ProgramKind::NotBuiltin => {
-                        compute_budget_instruction_details.num_non_builtin_instructions += 1;
-                    }
-                    ProgramKind::MigratingBuiltin {
-                        core_bpf_migration_feature_index,
-                    } => {
-                        *compute_budget_instruction_details
-                            .migrating_builtin_feature_counters
-                            .migrating_builtin
-                            .get_mut(core_bpf_migration_feature_index)
-                            .expect(
-                                "migrating feature index within range of MIGRATION_FEATURE_IDS",
-                            ) += 1;
-                    }
-                }
-            }
+        let mut builder = ComputeBudgetInstructionDetailsBuilder::default();
+        for (program_id, instruction) in instructions {
+            builder.process_instruction(program_id, &instruction)?;
         }
-
-        Ok(compute_budget_instruction_details)
+        Ok(builder.build())
     }
 
     pub fn sanitize_and_convert_to_compute_budget_limits(