From e4a1b3cb528083d127f2104e00421f0debd5a480 Mon Sep 17 00:00:00 2001
From: Armani Ferrante <armaniferrante@gmail.com>
Date: Mon, 10 May 2021 15:14:56 -0700
Subject: [PATCH] ts: Assign namespaces correctly (#272)

---
 ts/src/program/index.ts           |  2 +-
 ts/src/program/namespace/index.ts | 26 ++++++++++++--------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ts/src/program/index.ts b/ts/src/program/index.ts
index 401afd543..058fe69c1 100644
--- a/ts/src/program/index.ts
+++ b/ts/src/program/index.ts
@@ -65,7 +65,7 @@ export class Program {
    * const txSignature = await program.rpc.increment({
    *   accounts: {
    *     counter,
-	 *     authority,
+   *     authority,
    *   },
    * });
    * ```
diff --git a/ts/src/program/namespace/index.ts b/ts/src/program/namespace/index.ts
index 4aa5f08fe..3f7474097 100644
--- a/ts/src/program/namespace/index.ts
+++ b/ts/src/program/namespace/index.ts
@@ -21,9 +21,7 @@ export { SimulateNamespace } from "./simulate";
 
 export default class NamespaceFactory {
   /**
-   * build dynamically generates RPC methods.
-   *
-   * @returns an object with all the RPC methods attached.
+   * Generates all namespaces for a given program.
    */
   public static build(
     idl: Idl,
@@ -54,12 +52,12 @@ export default class NamespaceFactory {
     );
 
     idl.instructions.forEach((idlIx) => {
-      const ix = InstructionFactory.build(idlIx, coder, programId);
-      const tx = TransactionFactory.build(idlIx, ix);
-      const rpc = RpcFactory.build(idlIx, tx, idlErrors, provider);
-      const simulate = SimulateFactory.build(
+      const ixItem = InstructionFactory.build(idlIx, coder, programId);
+      const txItem = TransactionFactory.build(idlIx, ixItem);
+      const rpcItem = RpcFactory.build(idlIx, txItem, idlErrors, provider);
+      const simulateItem = SimulateFactory.build(
         idlIx,
-        tx,
+        txItem,
         idlErrors,
         provider,
         coder,
@@ -69,16 +67,16 @@ export default class NamespaceFactory {
 
       const name = camelCase(idlIx.name);
 
-      instruction[name] = ix;
-      transaction[name] = tx;
-      rpc[name] = rpc;
-      simulate[name] = simulate;
+      instruction[name] = ixItem;
+      transaction[name] = txItem;
+      rpc[name] = rpcItem;
+      simulate[name] = simulateItem;
     });
 
-    const accountFns = idl.accounts
+    const account = idl.accounts
       ? AccountFactory.build(idl, coder, programId, provider)
       : {};
 
-    return [rpc, instruction, transaction, accountFns, state, simulate];
+    return [rpc, instruction, transaction, account, state, simulate];
   }
 }