diff --git a/src/factions.ts b/src/factions.ts index cb22c50..72dd6db 100644 --- a/src/factions.ts +++ b/src/factions.ts @@ -212,20 +212,14 @@ export async function enlistToFaction( const idl = getIDL(programId); const provider = new AnchorProvider(connection, null, null); const program = new Program(idl, programId, provider); - const txInstruction = await program.instruction.processEnlistPlayer( - bump, - factionID, - { - accounts: { - playerFactionAccount: playerFactionPda, - playerAccount: playerPublicKey, - systemProgram: web3.SystemProgram.programId, - clock: web3.SYSVAR_CLOCK_PUBKEY, - }, + return await program.instruction.processEnlistPlayer(bump, factionID, { + accounts: { + playerFactionAccount: playerFactionPda, + playerAccount: playerPublicKey, + systemProgram: web3.SystemProgram.programId, + clock: web3.SYSVAR_CLOCK_PUBKEY, }, - ); - - return txInstruction; + }); } /** @@ -241,8 +235,7 @@ export async function getPlayer( const idl = getIDL(programId); const program = new Program(idl, programId, provider); - const [playerFactionPDA] = getPlayerFactionPDA(playerPublicKey, programId, - ); + const [playerFactionPDA] = getPlayerFactionPDA(playerPublicKey, programId); const obj = await program.account.playerFactionData.fetch(playerFactionPDA); return obj as PlayerFaction; } @@ -260,11 +253,7 @@ export async function getAllPlayers( const program = new Program(idl, programId, provider); const programAccounts = await program.account.playerFactionData.all(); - const players = programAccounts.map( - (player) => player.account, - ); - - return players; + return programAccounts.map((player) => player.account); } /** @@ -281,9 +270,7 @@ export async function getPlayersOfFaction( const program = new Program(idl, programId, provider); const programAccounts = await program.account.playerFactionData.all(); - const filtered = programAccounts + return programAccounts .map((player) => player.account) .filter((player) => player.factionId == factionID); - - return filtered; } diff --git a/src/marketplace/pda_getters/pda_info_getters.ts b/src/marketplace/pda_getters/pda_info_getters.ts index b811726..ef43863 100644 --- a/src/marketplace/pda_getters/pda_info_getters.ts +++ b/src/marketplace/pda_getters/pda_info_getters.ts @@ -4,13 +4,13 @@ import { getMarketVarsAccount, getRegisteredCurrencyAccount, } from './pda_getters'; -import { getMarketplaceProgram } from './../utils/getMarketplaceProgram'; +import { getMarketplaceProgram } from '../utils'; import { FeeExemptInfo, MarketVarsAccountInfo, RegisteredCurrencyInfo, RoyaltyTiers, -} from '../types/marketplace_accounts'; +} from '../types'; import { getStakingAccount, getStakingAccountInfo } from '../../atlas-staking'; /** @@ -44,8 +44,7 @@ export async function getFeeExemptAccountInfo( programId: programId, }); - const [feeExemptAccount] = getFeeExemptAccount(targetAccount, programId, - ); + const [feeExemptAccount] = getFeeExemptAccount(targetAccount, programId); const feeExemptInfo = await program.account.feeExempt.fetch(feeExemptAccount); return feeExemptInfo as FeeExemptInfo; }