Fix: Add missing SubscriptionCallback types (#241)

aragon · Aug 25, 2020 · cabb5be · cabb5be
1 parent 4fd868f
commit cabb5be
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/packages/connect-voting-disputable/src/models/Vote.ts b/packages/connect-voting-disputable/src/models/Vote.ts
@@ -8,7 +8,13 @@ import CastVote from './CastVote'
 import DisputableVoting from './DisputableVoting'
 import CollateralRequirement from './CollateralRequirement'
 import { IDisputableVotingConnector, VoteData } from '../types'
-import { toMilliseconds, bn, formatBn, PCT_BASE, PCT_DECIMALS } from '../helpers'
+import {
+  toMilliseconds,
+  bn,
+  formatBn,
+  PCT_BASE,
+  PCT_DECIMALS,
+} from '../helpers'
 
 export default class Vote {
   #connector: IDisputableVotingConnector
@@ -72,8 +78,11 @@ export default class Vote {
   }
 
   get hasEnded(): boolean {
-    return this.voteStatus !== 'Challenged' && this.voteStatus !== 'Disputed' &&
-           Date.now() >= toMilliseconds(this.endDate)
+    return (
+      this.voteStatus !== 'Challenged' &&
+      this.voteStatus !== 'Disputed' &&
+      Date.now() >= toMilliseconds(this.endDate)
+    )
   }
 
   get endDate(): string {
@@ -157,7 +166,7 @@ export default class Vote {
     return this.#connector.setting(this.settingId)
   }
 
-  onSetting(callback: Function): SubscriptionHandler {
+  onSetting(callback: SubscriptionCallback<Setting>): SubscriptionHandler {
     return this.#connector.onSetting(this.settingId, callback)
   }
 

diff --git a/packages/connect-voting-disputable/src/thegraph/connector.ts b/packages/connect-voting-disputable/src/thegraph/connector.ts
@@ -293,8 +293,11 @@ export default class DisputableVotingConnectorTheGraph
     )
   }
 
-  onERC20(tokenAddress: string, callback: Function): SubscriptionHandler {
-    return this.#gql.subscribeToQueryWithParser(
+  onERC20(
+    tokenAddress: string,
+    callback: SubscriptionCallback<ERC20>
+  ): SubscriptionHandler {
+    return this.#gql.subscribeToQueryWithParser<ERC20>(
       queries.GET_ERC20('subscription'),
       { tokenAddress },
       callback,

diff --git a/packages/connect-voting-disputable/src/thegraph/parsers/collateralRequirements.ts b/packages/connect-voting-disputable/src/thegraph/parsers/collateralRequirements.ts
@@ -17,7 +17,7 @@ export function parseCollateralRequirement(
     {
       id: collateralRequirement.id,
       voteId: collateralRequirement.vote.id,
-      token: collateralRequirement.token.id,
+      tokenId: collateralRequirement.token.id,
       actionAmount: collateralRequirement.actionAmount,
       challengeAmount: collateralRequirement.challengeAmount,
       challengeDuration: collateralRequirement.challengeDuration,