From febb0d07bacecc1aa97a33b31a219a2d13e139e1 Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 22 Feb 2022 23:38:16 +0100 Subject: [PATCH] spl: atoken error redesign (#1507) --- spl/src/associated_token.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spl/src/associated_token.rs b/spl/src/associated_token.rs index 4effe4d457..c46b09b8fd 100644 --- a/spl/src/associated_token.rs +++ b/spl/src/associated_token.rs @@ -1,11 +1,11 @@ use anchor_lang::solana_program::account_info::AccountInfo; -use anchor_lang::solana_program::entrypoint::ProgramResult; use anchor_lang::solana_program::pubkey::Pubkey; +use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; pub use spl_associated_token_account::{get_associated_token_address, ID}; -pub fn create<'info>(ctx: CpiContext<'_, '_, '_, 'info, Create<'info>>) -> ProgramResult { +pub fn create<'info>(ctx: CpiContext<'_, '_, '_, 'info, Create<'info>>) -> Result<()> { let ix = spl_associated_token_account::create_associated_token_account( ctx.accounts.payer.key, ctx.accounts.authority.key, @@ -24,6 +24,7 @@ pub fn create<'info>(ctx: CpiContext<'_, '_, '_, 'info, Create<'info>>) -> Progr ], ctx.signer_seeds, ) + .map_err(Into::into) } #[derive(Accounts)]