Merge pull request #1073 from metmirr/qnode_new_format_for_event_name

Qnode new format for event name
Joystream · Aug 27, 2020 · 5e378c5 · 5e378c5
2 parents 21ed453 + b44b859
commit 5e378c5
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 23 deletions.
diff --git a/query-node/examples/kusama-query-node/mappings/treasury/proposal.ts b/query-node/examples/kusama-query-node/mappings/treasury/proposal.ts
@@ -5,7 +5,7 @@ import { assert } from 'console';
 import * as BN from 'bn.js';
 
 // New proposal
-export async function handleProposed(db: DB, event: SubstrateEvent) {
+export async function treasuryProposed(db: DB, event: SubstrateEvent) {
   const { ProposalIndex } = event.event_params;
   if (event.extrinsic) {
     const proposal = new Proposal();
@@ -21,7 +21,7 @@ export async function handleProposed(db: DB, event: SubstrateEvent) {
 }
 
 // A proposal was rejected
-export async function handleRejected(db: DB, event: SubstrateEvent) {
+export async function treasuryRejected(db: DB, event: SubstrateEvent) {
   const { ProposalIndex } = event.event_params;
   const proposal = await db.get(Proposal, { where: { proposalIndex: ProposalIndex.toString() } });
 
@@ -34,7 +34,7 @@ export async function handleRejected(db: DB, event: SubstrateEvent) {
 }
 
 // A proposal is approved! Some funds have been allocated.
-export async function handleAwarded(db: DB, event: SubstrateEvent) {
+export async function treasuryAwarded(db: DB, event: SubstrateEvent) {
   const { ProposalIndex } = event.event_params;
   const proposal = await db.get(Proposal, { where: { proposalIndex: ProposalIndex.toString() } });
 

diff --git a/query-node/examples/kusama-query-node/mappings/treasury/tip.ts b/query-node/examples/kusama-query-node/mappings/treasury/tip.ts
@@ -4,7 +4,7 @@ import { Tipper } from '../../generated/graphql-server/src/modules/tipper/tipper
 import { assert } from 'console';
 import * as BN from 'bn.js';
 
-export async function handleNewTip(db: DB, event: SubstrateEvent) {
+export async function treasuryNewTip(db: DB, event: SubstrateEvent) {
   const { Hash } = event.event_params;
   const { extrinsic } = event;
 
@@ -33,7 +33,7 @@ export async function handleNewTip(db: DB, event: SubstrateEvent) {
   }
 }
 
-export async function handleTipRetracted(db: DB, event: SubstrateEvent) {
+export async function treasuryTipRetracted(db: DB, event: SubstrateEvent) {
   const { Hash } = event.event_params;
   const tip = await db.get(Tip, { where: { reason: Buffer.from(Hash.toString()) } });
 
@@ -45,7 +45,7 @@ export async function handleTipRetracted(db: DB, event: SubstrateEvent) {
 }
 
 // A tip suggestion has reached threshold and is closing.
-export async function handleTipClosing(db: DB, event: SubstrateEvent) {
+export async function treasuryTipClosing(db: DB, event: SubstrateEvent) {
   const { Hash } = event.event_params;
   const { extrinsic } = event;
   const tip = await db.get(Tip, { where: { reason: Buffer.from(Hash.toString()) } });
@@ -64,7 +64,7 @@ export async function handleTipClosing(db: DB, event: SubstrateEvent) {
 }
 
 // A tip suggestion has reached threshold and is closing.
-export async function handleTipClosed(db: DB, event: SubstrateEvent) {
+export async function treasuryTipClosed(db: DB, event: SubstrateEvent) {
   const { Hash, AccountId } = event.event_params;
   const { extrinsic } = event;
   const tip = await db.get(Tip, { where: { reason: Buffer.from(Hash.toString()) } });

diff --git a/query-node/substrate-query-framework/cli/src/templates/index-builder-entry.mst b/query-node/substrate-query-framework/cli/src/templates/index-builder-entry.mst
@@ -19,6 +19,7 @@ import {
   SubstrateEvent,
   createDBConnection,
   SavedEntityEvent,
+  QueryEventProcessingPack,
 } from "index-builder/lib";
 
 // Mappings use!
@@ -27,16 +28,12 @@ export { DatabaseManager as DB, getLogger, SubstrateEvent };
 const logger = getLogger();
 
 function getProcessingPack() {
-  const handlers = require("../../mappings");
-
-  let processingPack: { [key: string]: any } = {};
-
-  Object.keys(handlers)
-    .filter(handler => handler.startsWith("handle"))
-    .map((handler: string) => {
-      let eventName = handler.replace("handle", "");
-      processingPack[eventName] = handlers[handler];
-    });
+  let processingPack: QueryEventProcessingPack = {};
+  try {
+    processingPack = require('../../mappings');
+  } catch (e) {
+    throw new Error(`Cannot load mappings from "../../mappings"`);
+  }
   return processingPack;
 }
 

diff --git a/query-node/substrate-query-framework/index-builder/src/IndexBuilder.ts b/query-node/substrate-query-framework/index-builder/src/IndexBuilder.ts
@@ -97,7 +97,6 @@ export default class IndexBuilder {
 
       debug(`Processing event ${query_event.event_name}, index: ${i}`)
       query_event.log(0, debug);
-
 
       const queryRunner = getConnection().createQueryRunner();
       try {
@@ -106,9 +105,9 @@ export default class IndexBuilder {
         await queryRunner.startTransaction();
 
         // Call event handler
-        if (this._processing_pack[query_event.event_method]) {
+        if (this._processing_pack[query_event.event_name]) {
           debug(`Recognized: ` + query_event.event_name);
-          await this._processing_pack[query_event.event_method](makeDatabaseManager(queryRunner.manager), query_event);
+          await this._processing_pack[query_event.event_name](makeDatabaseManager(queryRunner.manager), query_event);
         } else {
           debug(`No mapping for  ${query_event.event_name}, skipping`);
         }

diff --git a/query-node/substrate-query-framework/index-builder/src/QueryEvent.ts b/query-node/substrate-query-framework/index-builder/src/QueryEvent.ts
@@ -31,7 +31,7 @@ export default class QueryEvent implements SubstrateEvent {
   get event_name(): string {
     const event = this.event_record.event;
 
-    return event.section + '.' + event.method;
+    return event.section + '_' + event.method;
   }
 
   get event_method(): string {

diff --git a/query-node/substrate-query-framework/index-builder/src/QueryEventProcessingPack.ts b/query-node/substrate-query-framework/index-builder/src/QueryEventProcessingPack.ts
@@ -3,7 +3,8 @@
 import { DatabaseManager, SubstrateEvent } from '.';
 
 export type QueryEventProcessorResult = void | Promise<void>;
+export type EventHandlerFunc = (db: DatabaseManager, event: SubstrateEvent) => QueryEventProcessorResult
 
 export default interface QueryEventProcessingPack {
-  [index: string]: (db: DatabaseManager, event: SubstrateEvent) => QueryEventProcessorResult;
+  [index: string]: EventHandlerFunc;
 }
diff --git a/query-node/substrate-query-framework/index-builder/src/db/entities.ts b/query-node/substrate-query-framework/index-builder/src/db/entities.ts
@@ -61,7 +61,7 @@ export class SavedEntityEvent {
     }
 
     lastProcessedEvent.index = event.index;
-    lastProcessedEvent.eventName = event.event_method;
+    lastProcessedEvent.eventName = event.event_name;
     lastProcessedEvent.blockNumber = event.block_number;
     lastProcessedEvent.updatedAt = new Date();