Match config/schema to diviner name

XYOracleNetwork · Dec 14, 2023 · e94f6b3 · e94f6b3
1 parent 06b340f
commit e94f6b3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/packages/payloadset/packages/evm/packages/token-interface/packages/diviner/src/Diviner.ts b/packages/payloadset/packages/evm/packages/token-interface/packages/diviner/src/Diviner.ts
@@ -17,12 +17,15 @@ import { Interface, JsonFragment } from 'ethers'
 
 import { EvmTokenInterfaceImplemented, EvmTokenInterfaceImplementedSchema, TokenInterface } from './Payload'
 
-export const EvmTokenInterfaceDivinerConfigSchema = `${EvmTokenInterfaceImplementedSchema}.diviner.config`
-export type EvmTokenInterfaceDivinerConfigSchema = typeof EvmTokenInterfaceDivinerConfigSchema
+export const EvmTokenInterfaceImplementedDivinerConfigSchema = `${EvmTokenInterfaceImplementedSchema}.diviner.config`
+export type EvmTokenInterfaceImplementedDivinerConfigSchema = typeof EvmTokenInterfaceImplementedDivinerConfigSchema
 
-export type EvmTokenInterfaceDivinerConfig = DivinerConfig<{ schema: EvmTokenInterfaceDivinerConfigSchema; tokenInterfaces?: TokenInterface[] }>
+export type EvmTokenInterfaceImplementedDivinerConfig = DivinerConfig<{
+  schema: EvmTokenInterfaceImplementedDivinerConfigSchema
+  tokenInterfaces?: TokenInterface[]
+}>
 
-export type EvmTokenInterfaceDivinerParams = DivinerParams<AnyConfigSchema<EvmTokenInterfaceDivinerConfig>>
+export type EvmTokenInterfaceImplementedDivinerParams = DivinerParams<AnyConfigSchema<EvmTokenInterfaceImplementedDivinerConfig>>
 
 type DistributiveMappedType<T> = T extends string ? { [K in T]: readonly JsonFragment[] } : never
 type TokenInterfaceDictionary = DistributiveMappedType<TokenInterface>
@@ -31,7 +34,7 @@ type TokenInterfaceDictionary = DistributiveMappedType<TokenInterface>
  * A diviner that checks if a contract implements a token interface
  */
 export class EvmTokenInterfaceImplementedDiviner<
-  TParams extends EvmTokenInterfaceDivinerParams = EvmTokenInterfaceDivinerParams,
+  TParams extends EvmTokenInterfaceImplementedDivinerParams = EvmTokenInterfaceImplementedDivinerParams,
 > extends AbstractDiviner<TParams, EvmContract, EvmTokenInterfaceImplemented> {
   /**
    * The list of supported token interfaces
@@ -46,7 +49,7 @@ export class EvmTokenInterfaceImplementedDiviner<
     ERC721Metadata: IERC721Metadata__factory.abi,
     ERC721TokenReceiver: IERC721Receiver__factory.abi,
   }
-  static override configSchemas = [EvmTokenInterfaceDivinerConfigSchema]
+  static override configSchemas = [EvmTokenInterfaceImplementedDivinerConfigSchema]
 
   private _tokenInterfaces?: TokenInterfaceDictionary
 

diff --git a/...ayloadset/packages/evm/packages/token-interface/packages/diviner/src/spec/Diviner.spec.ts b/...ayloadset/packages/evm/packages/token-interface/packages/diviner/src/spec/Diviner.spec.ts
@@ -2,7 +2,7 @@ import { describeIf } from '@xylabs/jest-helpers'
 import { EvmContractSchema, EvmContractWitness, EvmContractWitnessConfigSchema } from '@xyo-network/evm-contract-witness'
 import { BlockchainAddressSchema, getProvidersFromEnv } from '@xyo-network/witness-blockchain-abstract'
 
-import { EvmTokenInterfaceDivinerConfigSchema, EvmTokenInterfaceImplementedDiviner } from '../Diviner'
+import { EvmTokenInterfaceImplementedDiviner, EvmTokenInterfaceImplementedDivinerConfigSchema } from '../Diviner'
 import { TokenInterface } from '../Payload'
 
 describeIf(process.env.INFURA_PROJECT_ID)('EvmTokenInterfaceImplementedDiviner', () => {
@@ -22,7 +22,7 @@ describeIf(process.env.INFURA_PROJECT_ID)('EvmTokenInterfaceImplementedDiviner',
         })
         const diviner = await EvmTokenInterfaceImplementedDiviner.create({
           account: 'random',
-          config: { schema: EvmTokenInterfaceDivinerConfigSchema, tokenInterfaces },
+          config: { schema: EvmTokenInterfaceImplementedDivinerConfigSchema, tokenInterfaces },
         })
         const observations = await witness.observe([{ address, schema: BlockchainAddressSchema }])
         expect(observations?.length).toBeGreaterThan(0)
@@ -39,7 +39,7 @@ describeIf(process.env.INFURA_PROJECT_ID)('EvmTokenInterfaceImplementedDiviner',
       it.each(cases)('returns implemented false', async (address, tokenInterfaces) => {
         const diviner = await EvmTokenInterfaceImplementedDiviner.create({
           account: 'random',
-          config: { schema: EvmTokenInterfaceDivinerConfigSchema, tokenInterfaces },
+          config: { schema: EvmTokenInterfaceImplementedDivinerConfigSchema, tokenInterfaces },
         })
         const results = await diviner.divine([{ address, block: 0, chainId: 1, code: '0x00', schema: EvmContractSchema }])
         expect(results?.length).toBeGreaterThan(0)