From 9793e02c8718ec28665f3cba5c57de41890fe06c Mon Sep 17 00:00:00 2001
From: Gary Wang <gary@garywang.net>
Date: Tue, 1 Sep 2020 07:43:24 -0700
Subject: [PATCH] Replace makeMatchOrdersInstruction with
 makeMatchOrdersTransaction

---
 src/market.ts | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/market.ts b/src/market.ts
index ca6486f..1365868 100644
--- a/src/market.ts
+++ b/src/market.ts
@@ -586,6 +586,29 @@ export class Market {
     return { transaction, signers };
   }
 
+  async matchOrders(connection: Connection, feePayer: Account, limit: number) {
+    const tx = this.makeMatchOrdersTransaction(limit);
+    return await this._sendTransaction(connection, tx, [feePayer]);
+  }
+
+  makeMatchOrdersTransaction(limit: number): Transaction {
+    const tx = new Transaction();
+    tx.add(
+      DexInstructions.matchOrders({
+        market: this.address,
+        requestQueue: this._decoded.requestQueue,
+        eventQueue: this._decoded.eventQueue,
+        bids: this._decoded.bids,
+        asks: this._decoded.asks,
+        baseVault: this._decoded.baseVault,
+        quoteVault: this._decoded.quoteVault,
+        limit,
+        programId: this._programId,
+      }),
+    );
+    return tx;
+  }
+
   async loadRequestQueue(connection: Connection) {
     const { data } = throwIfNull(
       await connection.getAccountInfo(this._decoded.requestQueue),
@@ -725,26 +748,6 @@ export class Market {
   get tickSize() {
     return this.priceLotsToNumber(new BN(1));
   }
-
-  makeMatchOrdersInstruction(limit: number): TransactionInstruction {
-    return DexInstructions.matchOrders({
-      market: this.address,
-      requestQueue: this._decoded.requestQueue,
-      eventQueue: this._decoded.eventQueue,
-      bids: this._decoded.bids,
-      asks: this._decoded.asks,
-      baseVault: this._decoded.baseVault,
-      quoteVault: this._decoded.quoteVault,
-      limit,
-      programId: this._programId,
-    });
-  }
-
-  async matchOrders(connection: Connection, feePayer: Account, limit: number) {
-    const tx = new Transaction();
-    tx.add(this.makeMatchOrdersInstruction(limit));
-    return await this._sendTransaction(connection, tx, [feePayer]);
-  }
 }
 
 export interface MarketOptions {