@xyo-network/modules 2.42.7 → 2.42.9

package/package.json

@@ -10,13 +10,13 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/archivist": "^2.42.7",
-    "@xyo-network/bridge": "^2.42.7",
-    "@xyo-network/diviner": "^2.42.7",
-    "@xyo-network/module": "^2.42.7",
-    "@xyo-network/node": "^2.42.7",
-    "@xyo-network/panel": "^2.42.7",
-    "@xyo-network/witness": "^2.42.7",
+    "@xyo-network/archivist": "^2.42.9",
+    "@xyo-network/bridge": "^2.42.9",
+    "@xyo-network/diviner": "^2.42.9",
+    "@xyo-network/module": "^2.42.9",
+    "@xyo-network/node": "^2.42.9",
+    "@xyo-network/panel": "^2.42.9",
+    "@xyo-network/witness": "^2.42.9",
     "tslib": "^2.4.1"
   },
   "devDependencies": {
@@ -60,5 +60,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.42.7"
+  "version": "2.42.9"
 }

package/src/XyoModuleResolver.spec.ts

@@ -1,43 +1,32 @@
 /* eslint-disable import/no-internal-modules */
-import { MemoryArchivist, XyoArchivistGetQuerySchema } from '@xyo-network/archivist'
+import { ArchivistGetQuerySchema, MemoryArchivist } from '@xyo-network/archivist'
 import { IdWitness, IdWitnessConfigSchema } from '@xyo-network/id-plugin'
-import { AbstractModule, AbstractModuleResolver } from '@xyo-network/module'
+import { Module, SimpleModuleResolver } from '@xyo-network/module'
 import { XyoWitnessObserveQuerySchema } from '@xyo-network/witness'
 
-describe('AbstractModuleResolver', () => {
-  test('simple by address', async () => {
-    const archivist: AbstractModule = await MemoryArchivist.create()
-    const witness = await IdWitness.create({ config: { salt: 'test', schema: IdWitnessConfigSchema } })
-
-    const resolver = new AbstractModuleResolver()
+describe('XyoModuleResolver', () => {
+  let archivist: Module
+  let witness: Module
+  let resolver: SimpleModuleResolver
+  beforeAll(async () => {
+    archivist = await MemoryArchivist.create()
+    witness = await IdWitness.create({ config: { salt: 'test', schema: IdWitnessConfigSchema } })
+    resolver = new SimpleModuleResolver()
     resolver.add(archivist)
     resolver.add(witness)
-
+  })
+  test('simple by address', async () => {
     expect((await resolver.resolve({ address: [archivist.address] })).length).toBe(1)
     expect((await resolver.resolve({ address: [witness.address] })).length).toBe(1)
   })
   test('simple by config', async () => {
-    const archivist: AbstractModule = await MemoryArchivist.create()
-    const witness = await IdWitness.create({ config: { salt: 'test', schema: IdWitnessConfigSchema } })
-
-    const resolver = new AbstractModuleResolver()
-    resolver.add(archivist)
-    resolver.add(witness)
-
     expect((await resolver.resolve({ config: [MemoryArchivist.configSchema] })).length).toBe(1)
     expect((await resolver.resolve({ config: [IdWitness.configSchema] })).length).toBe(1)
   })
   test('simple by query', async () => {
-    const archivist: AbstractModule = await MemoryArchivist.create()
-    const witness = await IdWitness.create({ config: { salt: 'test', schema: IdWitnessConfigSchema } })
-
-    const resolver = new AbstractModuleResolver()
-    resolver.add(archivist)
-    resolver.add(witness)
-
-    expect((await resolver.resolve({ query: [[XyoArchivistGetQuerySchema, XyoWitnessObserveQuerySchema]] })).length).toBe(0)
-    expect((await resolver.resolve({ query: [[XyoArchivistGetQuerySchema]] })).length).toBe(1)
+    expect((await resolver.resolve({ query: [[ArchivistGetQuerySchema, XyoWitnessObserveQuerySchema]] })).length).toBe(0)
+    expect((await resolver.resolve({ query: [[ArchivistGetQuerySchema]] })).length).toBe(1)
     expect((await resolver.resolve({ query: [[XyoWitnessObserveQuerySchema]] })).length).toBe(1)
-    expect((await resolver.resolve({ query: [[XyoArchivistGetQuerySchema], [XyoWitnessObserveQuerySchema]] })).length).toBe(2)
+    expect((await resolver.resolve({ query: [[ArchivistGetQuerySchema], [XyoWitnessObserveQuerySchema]] })).length).toBe(2)
   })
 })