chore: subgraph refactor

Author: shotaronowhere

subgraph/src/entities/Dispute.ts

@@ -1,13 +1,11 @@
 import { KlerosCore, DisputeCreation } from "../../generated/KlerosCore/KlerosCore";
-import { Court, Dispute, PeriodIndexCounter } from "../../generated/schema";
-import { ZERO, ONE } from "../utils";
-import { BigInt } from "@graphprotocol/graph-ts";
-import { ensurePeriodIndexCounter } from "./PeriodIndexCounter";
+import { Court, Dispute } from "../../generated/schema";
+import { ZERO } from "../utils";
+import { getAndIncrementCounter } from "./PeriodIndexCounter";
 
 export function createDisputeFromEvent(event: DisputeCreation): void {
-  const contract = KlerosCore.bind(event.address);
   const disputeID = event.params._disputeID;
-  const disputeContractState = contract.disputes(disputeID);
+  const disputeContractState = KlerosCore.bind(event.address).disputes(disputeID);
   const dispute = new Dispute(disputeID.toString());
   const courtID = disputeContractState.value0.toString();
   dispute.court = courtID;
@@ -20,10 +18,7 @@ export function createDisputeFromEvent(event: DisputeCreation): void {
   dispute.overridden = false;
   dispute.lastPeriodChangeTs = event.block.timestamp;
   dispute.lastPeriodChangeBlockNumber = event.block.number;
-  const PeriodIndexCounter = ensurePeriodIndexCounter(dispute.period);
-  dispute.periodNotificationIndex = PeriodIndexCounter.counter;
-  PeriodIndexCounter.counter = PeriodIndexCounter.counter.plus(ONE);
-  PeriodIndexCounter.save();
+  dispute.periodNotificationIndex = getAndIncrementCounter(dispute.period);
   const court = Court.load(courtID);
   if (!court) return;
   dispute.periodDeadline = event.block.timestamp.plus(court.timesPerPeriod[0]);

subgraph/src/entities/Draw.ts

@@ -1,7 +1,6 @@
 import { Draw as DrawEvent } from "../../generated/KlerosCore/KlerosCore";
-import { Draw, PeriodIndexCounter, User } from "../../generated/schema";
-import { BigInt } from "@graphprotocol/graph-ts";
-import { ensurePeriodIndexCounter } from "./PeriodIndexCounter";
+import { Draw, User } from "../../generated/schema";
+import { getAndIncrementCounter } from "./PeriodIndexCounter";
 
 export function createDrawFromEvent(event: DrawEvent): void {
   const disputeID = event.params._disputeID.toString();
@@ -12,14 +11,8 @@ export function createDrawFromEvent(event: DrawEvent): void {
   const draw = new Draw(drawID);
   draw.blockNumber = event.block.number;
   const user = User.load(event.params._address.toHexString());
-  if (user) {
-    const duplicateNotification = user.disputes.includes(disputeID);
-    if (!duplicateNotification) {
-      const periodIndex = ensurePeriodIndexCounter("draw");
-      draw.drawNotificationIndex = periodIndex.counter;
-      periodIndex.counter = periodIndex.counter.plus(BigInt.fromI32(1));
-      periodIndex.save();
-    }
+  if (user && !user.disputes.includes(disputeID)) {
+    draw.drawNotificationIndex = getAndIncrementCounter("draw");
   }
   draw.dispute = disputeID;
   draw.round = roundID;

subgraph/src/entities/PeriodIndexCounter.ts

@@ -1,11 +1,14 @@
 import { PeriodIndexCounter } from "../../generated/schema";
 import { BigInt } from "@graphprotocol/graph-ts";
 
-export function ensurePeriodIndexCounter(id: string): PeriodIndexCounter {
+export function getAndIncrementCounter(id: string): BigInt {
   let counter = PeriodIndexCounter.load(id);
   if (!counter) {
     counter = new PeriodIndexCounter(id);
     counter.counter = BigInt.fromI32(0);
   }
-  return counter;
+  const counterOld = counter.counter;
+  counter.counter = counter.counter.plus(BigInt.fromI32(1));
+  counter.save();
+  return counterOld;
 }