simplify error conversion

ananas-block · ananas-block · commit ff999427bb27 · 2025-06-11T20:51:08.000+01:00
diff --git a/programs/system/src/processor/create_inputs_cpi_data.rs b/programs/system/src/processor/create_inputs_cpi_data.rs
@@ -112,7 +112,7 @@ pub fn create_inputs_cpi_data<'a, 'info, T: InstructionData<'a>>(
             hash_chain = cpi_ix_data.nullifiers[j].account_hash;
         } else {
             hash_chain = Poseidon::hashv(&[&hash_chain, &cpi_ix_data.nullifiers[j].account_hash])
-                .map_err(|e| ProgramError::from(SystemProgramError::from(e)))?;
+                .map_err(|e| SystemProgramError::from(e).into())?;
         }
     }
     // TODO: benchmark the chaining.
diff --git a/programs/system/src/processor/create_outputs_cpi_data.rs b/programs/system/src/processor/create_outputs_cpi_data.rs
@@ -169,15 +169,15 @@ pub fn create_outputs_cpi_data<'a, 'info, T: InstructionData<'a>>(
                 &cpi_ix_data.output_leaf_indices[j].into(),
                 is_batched,
             )
-            .map_err(|e| ProgramError::from(SystemProgramError::from(e)))?;
+            .map_err(|e| SystemProgramError::from(e).into())?;
         cpi_ix_data.leaves[j].account_index = index_merkle_tree_account_account - 1;
 
         if !cpi_ix_data.nullifiers.is_empty() {
             if j == 0 {
                 hash_chain = cpi_ix_data.leaves[j].leaf;
             } else {
                 hash_chain = Poseidon::hashv(&[&hash_chain, &cpi_ix_data.leaves[j].leaf])
-                    .map_err(|e| ProgramError::from(SystemProgramError::from(e)))?;
+                    .map_err(|e| SystemProgramError::from(e).into())?;
             }
         }
         context.set_rollover_fee(current_index as u8, rollover_fee);
diff --git a/programs/system/src/processor/process.rs b/programs/system/src/processor/process.rs
@@ -209,7 +209,7 @@ pub fn process<
                 &output_compressed_account_hashes,
                 current_slot,
             )
-            .map_err(|e| ProgramError::from(SystemProgramError::from(e)))?;
+            .map_err(|e| SystemProgramError::from(e).into())?;
         }
     }
     // 11. Sum check ---------------------------------------------------
diff --git a/programs/system/src/processor/verify_proof.rs b/programs/system/src/processor/verify_proof.rs
@@ -169,9 +169,9 @@ pub fn verify_proof(
         let public_input_hash = if !leaves.is_empty() && !addresses.is_empty() {
             // combined inclusion & non-inclusion proof
             let inclusion_hash = create_two_inputs_hash_chain(roots, leaves)
-                .map_err(|e| ProgramError::from(SystemProgramError::from(e)))?;
+                .map_err(|e| SystemProgramError::from(e).into())?;
             let non_inclusion_hash = create_two_inputs_hash_chain(address_roots, addresses)
-                .map_err(|e| ProgramError::from(SystemProgramError::from(e)))?;
+                .map_err(|e| SystemProgramError::from(e).into())?;
             create_hash_chain_from_slice(&[inclusion_hash, non_inclusion_hash])
                 .map_err(|e| ProgramError::from(SystemProgramError::from(e)))?
         } else if !leaves.is_empty() {

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ pub fn create_inputs_cpi_data<'a, 'info, T: InstructionData<'a>>(`
`112`	`112`	`hash_chain = cpi_ix_data.nullifiers[j].account_hash;`
`113`	`113`	`} else {`
`114`	`114`	`hash_chain = Poseidon::hashv(&[&hash_chain, &cpi_ix_data.nullifiers[j].account_hash])`
`115`		`- .map_err(\|e\| ProgramError::from(SystemProgramError::from(e)))?;`
	`115`	`+ .map_err(\|e\| SystemProgramError::from(e).into())?;`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`// TODO: benchmark the chaining.`
Original file line number	Diff line number	Diff line change
`@@ -169,15 +169,15 @@ pub fn create_outputs_cpi_data<'a, 'info, T: InstructionData<'a>>(`
`169`	`169`	`&cpi_ix_data.output_leaf_indices[j].into(),`
`170`	`170`	`is_batched,`
`171`	`171`	`)`
`172`		`- .map_err(\|e\| ProgramError::from(SystemProgramError::from(e)))?;`
	`172`	`+ .map_err(\|e\| SystemProgramError::from(e).into())?;`
`173`	`173`	`cpi_ix_data.leaves[j].account_index = index_merkle_tree_account_account - 1;`
`174`	`174`
`175`	`175`	`if !cpi_ix_data.nullifiers.is_empty() {`
`176`	`176`	`if j == 0 {`
`177`	`177`	`hash_chain = cpi_ix_data.leaves[j].leaf;`
`178`	`178`	`} else {`
`179`	`179`	`hash_chain = Poseidon::hashv(&[&hash_chain, &cpi_ix_data.leaves[j].leaf])`
`180`		`- .map_err(\|e\| ProgramError::from(SystemProgramError::from(e)))?;`
	`180`	`+ .map_err(\|e\| SystemProgramError::from(e).into())?;`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`	`context.set_rollover_fee(current_index as u8, rollover_fee);`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ pub fn process<`
`209`	`209`	`&output_compressed_account_hashes,`
`210`	`210`	`current_slot,`
`211`	`211`	`)`
`212`		`- .map_err(\|e\| ProgramError::from(SystemProgramError::from(e)))?;`
	`212`	`+ .map_err(\|e\| SystemProgramError::from(e).into())?;`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`	`// 11. Sum check ---------------------------------------------------`