🍉 - Clean up

tokens/token-2022/anchor/bckp.rs

@@ -1,131 +0,0 @@
-use anchor_lang::prelude::*;
-use anchor_spl::associated_token::AssociatedToken;
-use anchor_spl::token_interface::{
-    self, Mint, MintTo, TokenAccount, TokenInterface, TransferChecked,
-};
-
-declare_id!("6qNqxkRF791FXFeQwqYQLEzAbGiqDULC5SSHVsfRoG89");
-
-#[program]
-pub mod anchor {
-
-    use super::*;
-
-    pub fn create_token(_ctx: Context<CreateToken>, _token_name: String) -> Result<()> {
-        msg!("Create Token");
-        Ok(())
-    }
-    pub fn create_token_account(_ctx: Context<CreateTokenAccount>) -> Result<()> {
-        msg!("Create Token Account");
-        Ok(())
-    }
-    pub fn create_associated_token_account(
-        _ctx: Context<CreateAssociatedTokenAccount>,
-    ) -> Result<()> {
-        msg!("Create Associated Token Account");
-        Ok(())
-    }
-    pub fn transfer_token(ctx: Context<TransferToken>, amount: u64) -> Result<()> {
-        let cpi_accounts = TransferChecked {
-            from: ctx.accounts.from.to_account_info().clone(),
-            mint: ctx.accounts.mint.to_account_info().clone(),
-            to: ctx.accounts.to.to_account_info().clone(),
-            authority: ctx.accounts.signer.to_account_info(),
-        };
-        let cpi_program = ctx.accounts.token_program.to_account_info();
-        let cpi_context = CpiContext::new(cpi_program, cpi_accounts);
-        token_interface::transfer_checked(cpi_context, amount, ctx.accounts.mint.decimals)?;
-        msg!("Transfer Token");
-        Ok(())
-    }
-    pub fn mint_token(ctx: Context<MintToken>, amount: u64) -> Result<()> {
-        let cpi_accounts = MintTo {
-            mint: ctx.accounts.mint.to_account_info().clone(),
-            to: ctx.accounts.receiver.to_account_info().clone(),
-            authority: ctx.accounts.signer.to_account_info(),
-        };
-        let cpi_program = ctx.accounts.token_program.to_account_info();
-        let cpi_context = CpiContext::new(cpi_program, cpi_accounts);
-        token_interface::mint_to(cpi_context, amount)?;
-        msg!("Mint Token");
-        Ok(())
-    }
-}
-
-#[derive(Accounts)]
-#[instruction(token_name: String)]
-pub struct CreateToken<'info> {
-    #[account(mut)]
-    pub signer: Signer<'info>,
-    #[account(
-        init,
-        payer = signer,
-        mint::decimals = 6,
-        mint::authority = signer.key(),
-        seeds = [b"token-2022-token", signer.key().as_ref(), token_name.as_bytes()],
-        bump,
-    )]
-    pub mint: InterfaceAccount<'info, Mint>,
-    pub system_program: Program<'info, System>,
-    pub token_program: Interface<'info, TokenInterface>,
-}
-
-#[derive(Accounts)]
-pub struct CreateTokenAccount<'info> {
-    #[account(mut)]
-    pub signer: Signer<'info>,
-    pub mint: InterfaceAccount<'info, Mint>,
-    #[account(
-        init,
-        token::mint = mint,
-        token::authority = signer,
-        payer = signer,
-        seeds = [b"token-2022-token-account", signer.key().as_ref(), mint.key().as_ref()],
-        bump,
-    )]
-    pub token_account: InterfaceAccount<'info, TokenAccount>,
-    pub system_program: Program<'info, System>,
-    pub token_program: Interface<'info, TokenInterface>,
-}
-
-#[derive(Accounts)]
-pub struct CreateAssociatedTokenAccount<'info> {
-    #[account(mut)]
-    pub signer: Signer<'info>,
-    pub mint: InterfaceAccount<'info, Mint>,
-    #[account(
-        init,
-        associated_token::mint = mint,
-        payer = signer,
-        associated_token::authority = signer,
-    )]
-    pub token_account: InterfaceAccount<'info, TokenAccount>,
-    pub system_program: Program<'info, System>,
-    pub token_program: Interface<'info, TokenInterface>,
-    pub associated_token_program: Program<'info, AssociatedToken>,
-}
-
-#[derive(Accounts)]
-
-pub struct TransferToken<'info> {
-    #[account(mut)]
-    pub signer: Signer<'info>,
-    #[account(mut)]
-    pub from: InterfaceAccount<'info, TokenAccount>,
-    #[account(mut)]
-    pub to: InterfaceAccount<'info, TokenAccount>,
-    #[account(mut)]
-    pub mint: InterfaceAccount<'info, Mint>,
-    pub token_program: Interface<'info, TokenInterface>,
-}
-
-#[derive(Accounts)]
-pub struct MintToken<'info> {
-    #[account(mut)]
-    pub signer: Signer<'info>,
-    #[account(mut)]
-    pub mint: InterfaceAccount<'info, Mint>,
-    #[account(mut)]
-    pub receiver: InterfaceAccount<'info, TokenAccount>,
-    pub token_program: Interface<'info, TokenInterface>,
-}

tokens/token-2022/anchor/tests/anchor.ts

@@ -17,9 +17,7 @@ describe("anchor", () => {
   const TOKEN_2022_PROGRAM_ID = new anchor.web3.PublicKey(
     "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
   );
-  const payer = loadKeypairFromFile(
-    require("os").homedir() + "/.config/solana/id.json"
-  );
+  const payer = anchor.web3.Keypair.generate();
   const ATA_PROGRAM_ID = new anchor.web3.PublicKey(
     "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
   );
@@ -42,9 +40,7 @@ describe("anchor", () => {
     ATA_PROGRAM_ID
   );
 
-  const receiver = loadKeypairFromFile(
-    require("os").homedir() + "/.config/solana/testkeypair1.json"
-  );
+  const receiver = anchor.web3.Keypair.generate();
 
   connection.requestAirdrop(receiver.publicKey, 1000000000);
 
@@ -103,6 +99,7 @@ describe("anchor", () => {
   });
 
   /*
+  // Comment out because we use init in the transfer instruction
   it("Initialize receiver ATA", async () => {
     const tx = new anchor.web3.Transaction();