Remove the tracker query from the tx API

Author: joojis

src/models/logic/transaction.ts

@@ -399,6 +399,9 @@ async function getTransactionHashes(params: {
     if (params.type != null) {
         where.type = { [Sequelize.Op.in]: params.type };
     }
+    if (params.onlySuccessful) {
+        where.errorHint = null;
+    }
     if (params.includePending !== true) {
         where.isPending = false;
     }
@@ -435,7 +438,6 @@ export async function getTransactions(params: {
     address?: string | null;
     assetType?: H160 | null;
     type?: string[] | null;
-    tracker?: H256 | null;
     page: number;
     itemsPerPage: number;
     includePending?: boolean | null;
@@ -516,13 +518,11 @@ export async function getNumberOfEachTransactionType(
 
 function buildQueryForTransactions(params: {
     type?: string[] | null;
-    tracker?: H256 | null;
     includePending?: boolean | null;
     onlySuccessful?: boolean | null;
 }) {
     return {
         ...(params.type ? { type: { [Sequelize.Op.in]: params.type } } : {}),
-        ...(params.tracker ? { tracker: params.tracker.value } : {}),
         ...(params.onlySuccessful ? { errorHint: null } : {}),
         ...(params.includePending !== true ? { isPending: false } : {})
         /* FIXME: onlyConfirmed, confirmThreshold */

src/routers/transaction.ts

@@ -47,11 +47,6 @@ export function handle(context: IndexerContext, router: Router) {
      *         in: query
      *         required: false
      *         type: string
-     *       - name: tracker
-     *         description: filter by tracker
-     *         in: query
-     *         required: false
-     *         type: string
      *       - name: type
      *         description: filter by type such as mintAsset, transferAsset, etc. Multiple types can be given by comma separating.
      *         in: query
@@ -113,7 +108,6 @@ export function handle(context: IndexerContext, router: Router) {
             const address = req.query.address;
             const assetTypeString = req.query.assetType;
             const type = req.query.type;
-            const trackerString = req.query.tracker;
             const page = (req.query.page && parseInt(req.query.page, 10)) || 1;
             const itemsPerPage =
                 (req.query.itemsPerPage &&
@@ -126,20 +120,15 @@ export function handle(context: IndexerContext, router: Router) {
                 req.query.confirmThreshold &&
                 parseInt(req.query.confirmThreshold, 10);
             let assetType;
-            let tracker;
             try {
                 if (assetTypeString) {
                     assetType = new H160(assetTypeString);
                 }
-                if (trackerString) {
-                    tracker = new H256(trackerString);
-                }
                 const txInsts = await TxModel.getTransactions({
                     address,
                     assetType,
                     type:
                         typeof type === "string" ? type.split(",") : undefined,
-                    tracker,
                     page,
                     itemsPerPage,
                     includePending,

src/routers/validator.ts

@@ -42,7 +42,6 @@ export const platformAddressSchema = Joi.string();
 // FIXME: PlatformAddress or AssetAddress
 const address = Joi.string();
 export const assetTypeSchema = Joi.string().regex(/^(0x)?[0-9a-f]{40}$/);
-const tracker = Joi.string().regex(/^(0x)?[0-9a-f]{64}$/);
 const type = Joi.string().regex(
     new RegExp(`^(${TYPES.join("|")})(,(${TYPES.join("|")}))*$`)
 );
@@ -74,7 +73,6 @@ export const paginationSchema = {
 export const txSchema = {
     address,
     assetType: assetTypeSchema,
-    tracker,
     type,
     includePending,
     onlySuccessful,

test/api/transaction.spec.ts

@@ -141,11 +141,8 @@ describe("transaction-api", function() {
 
     it("api /tx with args", async function() {
         const assetType = mintRubyTx.getMintedAsset().assetType;
-        const tracker = mintRubyTx.tracker().value;
         await request(app)
-            .get(
-                `/api/tx?assetType=${assetType}&tracker=${tracker}&type=mintAsset`
-            )
+            .get(`/api/tx?assetType=${assetType}&type=mintAsset`)
             .expect(200)
             .expect(res =>
                 expect(Object.keys(JSON.parse(res.text)).length).equal(1)