diff --git a/js/packages/common/src/contexts/accounts.tsx b/js/packages/common/src/contexts/accounts.tsx index 09c4eda..e984256 100644 --- a/js/packages/common/src/contexts/accounts.tsx +++ b/js/packages/common/src/contexts/accounts.tsx @@ -146,7 +146,7 @@ export const cache = { id: PublicKey | string, obj: AccountInfo, parser?: AccountParser, - isEligibleForSub?: boolean | undefined | ((parsed: any) => boolean), + isActive?: boolean | undefined | ((parsed: any) => boolean), ) => { if (obj.data.length === 0) { return; @@ -167,19 +167,13 @@ export const cache = { return; } - if (isEligibleForSub == undefined) isEligibleForSub = true; - else if (isEligibleForSub instanceof Function) - isEligibleForSub = isEligibleForSub(account); + if (isActive == undefined) isActive = true; + else if (isActive instanceof Function) isActive = isActive(account); const isNew = !genericCache.has(address); genericCache.set(address, account); - cache.emitter.raiseCacheUpdated( - address, - isNew, - deserialize, - isEligibleForSub, - ); + cache.emitter.raiseCacheUpdated(address, isNew, deserialize, isActive); return account; }, get: (pubKey: string | PublicKey) => { @@ -417,7 +411,7 @@ export function AccountsProvider({ children = null as any }) { cache.emitter.onCache(args => { cache.totalObjects += 1; - if (args.isNew && args.isEligibleForSub) { + if (args.isNew && args.isActive) { cache.totalSubs += 1; let id = args.id; let deserialize = args.parser; diff --git a/js/packages/common/src/utils/eventEmitter.ts b/js/packages/common/src/utils/eventEmitter.ts index cd3a7da..6d111ce 100644 --- a/js/packages/common/src/utils/eventEmitter.ts +++ b/js/packages/common/src/utils/eventEmitter.ts @@ -5,17 +5,12 @@ export class CacheUpdateEvent { id: string; parser: any; isNew: boolean; - isEligibleForSub: boolean; - constructor( - id: string, - isNew: boolean, - parser: any, - isEligibleForSub: boolean, - ) { + isActive: boolean; + constructor(id: string, isNew: boolean, parser: any, isActive: boolean) { this.id = id; this.parser = parser; this.isNew = isNew; - this.isEligibleForSub = isEligibleForSub; + this.isActive = isActive; } } @@ -58,11 +53,11 @@ export class EventEmitter { id: string, isNew: boolean, parser: any, - isEligibleForSub: boolean, + isActive: boolean, ) { this.emitter.emit( CacheUpdateEvent.type, - new CacheUpdateEvent(id, isNew, parser, isEligibleForSub), + new CacheUpdateEvent(id, isNew, parser, isActive), ); }