From ce6d647fdfcc6c94ce4b61477b9ef160d64c2e2b Mon Sep 17 00:00:00 2001 From: armaniferrante Date: Mon, 4 Jan 2021 23:59:52 -0800 Subject: [PATCH] Run prettier --- ts/src/index.ts | 13 +++++-- ts/src/rpc.ts | 36 +++++++++---------- ts/src/workspace.ts | 84 +++++++++++++++++++++------------------------ 3 files changed, 69 insertions(+), 64 deletions(-) diff --git a/ts/src/index.ts b/ts/src/index.ts index ce782139a..08ba75dfc 100644 --- a/ts/src/index.ts +++ b/ts/src/index.ts @@ -3,7 +3,7 @@ import * as web3 from "@solana/web3.js"; import { Provider } from "@project-serum/common"; import { Program } from "./program"; import Coder from "./coder"; -import workspace from './workspace'; +import workspace from "./workspace"; let _provider: Provider | null = null; @@ -15,4 +15,13 @@ function getProvider(): Provider { return _provider; } -export { workspace, Program, Coder, setProvider, getProvider, Provider, BN, web3 }; +export { + workspace, + Program, + Coder, + setProvider, + getProvider, + Provider, + BN, + web3, +}; diff --git a/ts/src/rpc.ts b/ts/src/rpc.ts index fee1ec904..1d081e065 100644 --- a/ts/src/rpc.ts +++ b/ts/src/rpc.ts @@ -105,24 +105,24 @@ export class RpcFactory { ixFns[name] = ix; }); - if (idl.accounts) { - idl.accounts.forEach((idlAccount) => { - // todo - const accountFn = async (address: PublicKey): Promise => { - const provider = getProvider(); - if (provider === null) { - throw new Error("Provider not set"); - } - const accountInfo = await provider.connection.getAccountInfo(address); - if (accountInfo === null) { - throw new Error(`Entity does not exist ${address}`); - } - return coder.accounts.decode(idlAccount.name, accountInfo.data); - }; - const name = camelCase(idlAccount.name); - accountFns[name] = accountFn; - }); - } + if (idl.accounts) { + idl.accounts.forEach((idlAccount) => { + // todo + const accountFn = async (address: PublicKey): Promise => { + const provider = getProvider(); + if (provider === null) { + throw new Error("Provider not set"); + } + const accountInfo = await provider.connection.getAccountInfo(address); + if (accountInfo === null) { + throw new Error(`Entity does not exist ${address}`); + } + return coder.accounts.decode(idlAccount.name, accountInfo.data); + }; + const name = camelCase(idlAccount.name); + accountFns[name] = accountFn; + }); + } return [rpcs, ixFns, accountFns]; } diff --git a/ts/src/workspace.ts b/ts/src/workspace.ts index eef7953cf..1674549ab 100644 --- a/ts/src/workspace.ts +++ b/ts/src/workspace.ts @@ -1,58 +1,54 @@ import camelCase from "camelcase"; -import { PublicKey } from '@solana/web3.js'; -import { Program } from './program'; +import { PublicKey } from "@solana/web3.js"; +import { Program } from "./program"; let _populatedWorkspace = false; // Workspace program discovery only works for node environments. export default new Proxy({} as any, { - get( - workspaceCache: { [key: string]: Program }, - programName: string - ) { - const find = require('find'); - const fs = require('fs'); - const process = require('process'); + get(workspaceCache: { [key: string]: Program }, programName: string) { + const find = require("find"); + const fs = require("fs"); + const process = require("process"); - if (typeof window !== 'undefined') { + if (typeof window !== "undefined") { + throw new Error("`anchor.workspace` is not available in the browser"); + } + + if (!_populatedWorkspace) { + const path = require("path"); + + let projectRoot = process.cwd(); + while (!fs.existsSync(path.join(projectRoot, "Anchor.toml"))) { + const parentDir = path.dirname(projectRoot); + if (parentDir === projectRoot) { + projectRoot = undefined; + } + projectRoot = parentDir; + } + + if (projectRoot === undefined) { throw new Error( - '`anchor.workspace` is not available in the browser' + "Could not find workspace root. Perhaps set the `OASIS_WORKSPACE` env var?" ); } - if (!_populatedWorkspace) { - const path = require('path'); - - let projectRoot = process.cwd(); - while (!fs.existsSync(path.join(projectRoot, 'Anchor.toml'))) { - const parentDir = path.dirname(projectRoot); - if (parentDir === projectRoot) { - projectRoot = undefined; - } - projectRoot = parentDir; - } - - - if (projectRoot === undefined) { - throw new Error( - 'Could not find workspace root. Perhaps set the `OASIS_WORKSPACE` env var?' + find + .fileSync(/target\/idl\/.*\.json/, projectRoot) + .reduce((programs: any, path: string) => { + const idlStr = fs.readFileSync(path); + const idl = JSON.parse(idlStr); + const name = camelCase(idl.name, { pascalCase: true }); + programs[name] = new Program( + idl, + new PublicKey(idl.metadata.address) ); - } + return programs; + }, workspaceCache); - find - .fileSync(/target\/idl\/.*\.json/, projectRoot) - .reduce((programs: any, path: string) => { - const idlStr = fs.readFileSync(path); - const idl = JSON.parse(idlStr); - const name = camelCase(idl.name, { pascalCase: true }); - programs[name] = new Program(idl, new PublicKey(idl.metadata.address)); - return programs; - }, workspaceCache); + _populatedWorkspace = true; + } - _populatedWorkspace = true; - } - - return workspaceCache[programName]; - }, - } -); + return workspaceCache[programName]; + }, +});