@xyo-network/modules 2.44.0 → 2.45.0-rc.1

package/package.json

@@ -10,18 +10,18 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/archivist": "^2.44.0",
-    "@xyo-network/bridge": "^2.44.0",
-    "@xyo-network/diviner": "^2.44.0",
-    "@xyo-network/module": "^2.44.0",
-    "@xyo-network/node": "^2.44.0",
-    "@xyo-network/panel": "^2.44.0",
-    "@xyo-network/sentinel": "^2.44.0",
-    "@xyo-network/witness": "^2.44.0"
+    "@xyo-network/archivist": "^2.45.0-rc.1",
+    "@xyo-network/bridge": "^2.45.0-rc.1",
+    "@xyo-network/diviner": "^2.45.0-rc.1",
+    "@xyo-network/module": "^2.45.0-rc.1",
+    "@xyo-network/node": "^2.45.0-rc.1",
+    "@xyo-network/panel": "^2.45.0-rc.1",
+    "@xyo-network/sentinel": "^2.45.0-rc.1",
+    "@xyo-network/witness": "^2.45.0-rc.1"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^2.14.14",
-    "@xylabs/tsconfig": "^2.14.14",
+    "@xylabs/ts-scripts-yarn3": "^2.14.15",
+    "@xylabs/tsconfig": "^2.14.15",
     "typescript": "^4.9.5"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -57,5 +57,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.44.0"
+  "version": "2.45.0-rc.1",
+  "stableVersion": "2.44.1"
 }

package/src/spec/VariousNodeConfigurations.spec.ts

@@ -0,0 +1,83 @@
+import { MemoryArchivist, MemoryArchivistConfigSchema } from '@xyo-network/archivist'
+import { MemoryAddressHistoryDiviner, MemoryAddressHistoryDivinerConfigSchema } from '@xyo-network/diviner'
+import { IdWitness, IdWitnessConfigSchema } from '@xyo-network/id-plugin'
+import { AbstractModule } from '@xyo-network/module'
+import { MemoryNode, NodeConfigSchema, NodeWrapper } from '@xyo-network/node'
+
+describe('MultiNodeConfiguration', () => {
+  let primaryArchivist: AbstractModule
+  let primaryNode: MemoryNode
+  let primaryNodeWrapper: NodeWrapper
+
+  let leftArchivist: AbstractModule
+  let leftDiviner: AbstractModule
+  let leftNode: MemoryNode
+  let leftNodeWrapper: NodeWrapper
+
+  let rightNode: MemoryNode
+  let rightNodeWrapper: NodeWrapper
+  let rightArchivist: AbstractModule
+  let rightWitness: AbstractModule
+
+  beforeAll(async () => {
+    primaryNode = await MemoryNode.create({ config: { name: 'primaryNode', schema: NodeConfigSchema } })
+    primaryNodeWrapper = new NodeWrapper(primaryNode)
+    primaryArchivist = await MemoryArchivist.create({ config: { name: 'primaryArchivist', schema: MemoryArchivistConfigSchema } })
+    primaryNode.register(primaryArchivist).attach(primaryArchivist.address, true)
+
+    rightNode = await MemoryNode.create({ config: { name: 'rightNode', schema: NodeConfigSchema } })
+    rightNodeWrapper = new NodeWrapper(rightNode)
+    rightArchivist = await MemoryArchivist.create()
+    rightWitness = await IdWitness.create({ config: { name: 'rightWitness', salt: 'test', schema: IdWitnessConfigSchema } })
+    rightNode.register(rightArchivist).attach(rightArchivist.address, true)
+    rightNode.register(rightWitness).attach(rightWitness.address, true)
+
+    leftNode = await MemoryNode.create({ config: { name: 'leftNode', schema: NodeConfigSchema } })
+    leftNodeWrapper = new NodeWrapper(leftNode)
+    leftArchivist = await MemoryArchivist.create({ config: { name: 'leftArchivist', schema: MemoryArchivistConfigSchema } })
+    leftDiviner = await MemoryAddressHistoryDiviner.create({
+      config: { address: leftNode.address, name: 'leftDiviner', schema: MemoryAddressHistoryDivinerConfigSchema },
+    })
+    leftNode.register(leftArchivist).attach(leftArchivist.address, true)
+    leftNode.register(leftDiviner).attach(leftDiviner.address, true)
+
+    primaryNode.register(leftNode)
+    primaryNode.register(rightNode)
+  })
+  test('leftNode', async () => {
+    primaryNode.attach(leftNode.address, true)
+    primaryNode.detach(rightNode.address)
+    expect((await primaryNode.resolve({ address: [primaryArchivist.address] })).length).toBe(1)
+    expect((await primaryNode.resolve({ name: ['primaryArchivist'] })).length).toBe(1)
+
+    expect((await leftNode.resolve({ address: [leftDiviner.address] })).length).toBe(1)
+    expect((await leftNode.resolve({ name: ['leftDiviner'] })).length).toBe(1)
+
+    expect((await rightNode.resolve({ address: [rightWitness.address] })).length).toBe(1)
+    expect((await rightNode.resolve({ name: ['rightWitness'] })).length).toBe(1)
+
+    expect((await primaryNode.resolve({ address: [leftNode.address] })).length).toBe(1)
+    expect((await primaryNode.resolve({ name: ['leftNode'] })).length).toBe(1)
+
+    expect((await primaryNode.resolve({ address: [rightNode.address] })).length).toBe(0)
+    expect((await primaryNode.resolve({ name: ['rightNode'] })).length).toBe(0)
+
+    expect((await primaryNode.resolve({ address: [leftDiviner.address] })).length).toBe(1)
+    expect((await primaryNode.resolve({ name: ['leftDiviner'] })).length).toBe(1)
+
+    expect((await primaryNode.resolve({ address: [rightWitness.address] })).length).toBe(0)
+    expect((await primaryNode.resolve({ name: ['rightWitness'] })).length).toBe(0)
+  })
+
+  test('rightNode', async () => {
+    primaryNode.attach(rightNode.address, true)
+    primaryNode.detach(leftNode.address)
+    expect((await primaryNode.resolve({ address: [primaryArchivist.address] })).length).toBe(1)
+    expect((await leftNode.resolve({ address: [leftDiviner.address] })).length).toBe(1)
+    expect((await rightNode.resolve({ address: [rightWitness.address] })).length).toBe(1)
+    expect((await primaryNode.resolve({ address: [rightNode.address] })).length).toBe(1)
+    expect((await primaryNode.resolve({ address: [leftNode.address] })).length).toBe(0)
+    expect((await primaryNode.resolve({ address: [rightWitness.address] })).length).toBe(1)
+    expect((await primaryNode.resolve({ address: [leftDiviner.address] })).length).toBe(0)
+  })
+})

package/src/spec/XyoModuleResolver.spec.ts

@@ -1,17 +1,17 @@
 /* eslint-disable import/no-internal-modules */
 import { ArchivistGetQuerySchema, MemoryArchivist } from '@xyo-network/archivist'
 import { IdWitness, IdWitnessConfigSchema } from '@xyo-network/id-plugin'
-import { Module, SimpleModuleResolver } from '@xyo-network/module'
+import { AbstractModule, CompositeModuleResolver } from '@xyo-network/module'
 import { XyoWitnessObserveQuerySchema } from '@xyo-network/witness'
 
 describe('XyoModuleResolver', () => {
-  let archivist: Module
-  let witness: Module
-  let resolver: SimpleModuleResolver
+  let archivist: AbstractModule
+  let witness: AbstractModule
+  let resolver: CompositeModuleResolver
   beforeAll(async () => {
     archivist = await MemoryArchivist.create()
     witness = await IdWitness.create({ config: { salt: 'test', schema: IdWitnessConfigSchema } })
-    resolver = new SimpleModuleResolver()
+    resolver = new CompositeModuleResolver()
     resolver.add(archivist)
     resolver.add(witness)
   })