test: fix tests

Author: rflechtner

src/messaging/Message.test.ts

@@ -15,11 +15,10 @@
  */
 
 import { Attestation, CType } from '@kiltprotocol/credentials'
-import { SupportedContentType, createLightDidDocument, multibaseKeyToDidKey, parse } from '@kiltprotocol/did'
+import { createLightDidDocument, multibaseKeyToDidKey, parse } from '@kiltprotocol/did'
 import { Claim, Credential } from '@kiltprotocol/legacy-credentials'
 import { DidResolver, init } from '@kiltprotocol/sdk-js'
 import type {
-  DereferenceResult,
   Did,
   DidDocument,
   DidUrl,
@@ -38,6 +37,7 @@ import {
   createLocalDemoFullDidFromKeypair,
   createLocalDemoFullDidFromLightDid,
   makeEncryptionKeyTool,
+  makeMockDereference,
   makeSigningKeyTool,
 } from '../tests'
 import type {
@@ -63,6 +63,8 @@ import { decrypt, encrypt, verifyMessageEnvelope } from './MessageEnvelope'
 import { fromBody, verifyRequiredCTypeProperties } from './utils'
 
 describe('Messaging', () => {
+  let mockDereference: ReturnType<typeof makeMockDereference>
+
   let aliceLightDid: DidDocument
   let aliceLightDidWithDetails: DidDocument
   let aliceFullDid: DidDocument
@@ -76,30 +78,6 @@ describe('Messaging', () => {
   let bobAuthentication: SignerInterface<Signers.DidPalletSupportedAlgorithms, DidUrl>
   const bobEncKey = makeEncryptionKeyTool('Bob//enc')
 
-  async function mockDereference(keyUri: DidUrl | Did): Promise<DereferenceResult<SupportedContentType>> {
-    const { did, fragment } = parse(keyUri)
-    const document = [
-      aliceLightDidWithDetails,
-      aliceLightDid,
-      aliceFullDid,
-      bobLightDidWithDetails,
-      bobLightDid,
-      bobFullDid,
-    ].find(({ id }) => id === did)
-    if (!document) throw new Error('Cannot resolve mocked DID')
-    let result
-    if (!fragment) {
-      result = document
-    } else {
-      result = document.verificationMethod?.find(({ id }) => keyUri.endsWith(id))
-    }
-    return {
-      contentStream: result,
-      contentMetadata: {},
-      dereferencingMetadata: {} as any,
-    }
-  }
-
   beforeAll(async () => {
     await init()
     const aliceAuthKey = await makeSigningKeyTool('ed25519')
@@ -138,6 +116,15 @@ describe('Messaging', () => {
         algorithms: Signers.DID_PALLET_SUPPORTED_ALGORITHMS,
       })
     )[0]
+
+    mockDereference = makeMockDereference([
+      aliceLightDidWithDetails,
+      aliceLightDid,
+      aliceFullDid,
+      bobLightDidWithDetails,
+      bobLightDid,
+      bobFullDid,
+    ])
   })
 
   it('verify message encryption and signing', async () => {

src/messaging/interface/attestation/Attestation.test.ts

@@ -6,51 +6,47 @@
  */
 
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-import {
-  CType,
-  Claim,
-  DidDocument,
-  ICType,
-  IClaim,
-  Credential,
-  Quote,
-  IConfirmPaymentContent,
-  IAttestation,
-  connect,
-  KiltKeyringPair,
-  DecryptCallback,
-  EncryptCallback,
-  ConfigService,
-  ChainHelpers,
-  Blockchain,
-} from '@kiltprotocol/sdk-js'
+import { Blockchain } from '@kiltprotocol/chain-helpers'
+import { CType } from '@kiltprotocol/credentials'
+import { Claim, Credential } from '@kiltprotocol/legacy-credentials'
+import { ConfigService, connect } from '@kiltprotocol/sdk-js'
+import type { DidDocument, IAttestation, ICType, IClaim, KiltKeyringPair } from '@kiltprotocol/types'
+import Keyring from '@polkadot/keyring'
 import { BN } from '@polkadot/util'
 import { mnemonicGenerate } from '@polkadot/util-crypto'
-import Keyring from '@polkadot/keyring'
-
 import {
-  KeyToolSignCallback,
+  confirmPayment,
+  receiveAttestation,
+  requestAttestation,
+  requestPayment,
+  submitAttestation,
+  submitTerms,
+  validateConfirmedPayment,
+} from '.'
+import { createAttesterSignedQuote, verifyAttesterSignedQuote, verifyQuoteAgreement } from '../../../quote'
+import {
+  KeyToolSigners,
   createAttestation,
   createCtype,
   fundAccount,
   generateDid,
   keypairs,
   makeDecryptCallback,
+  makeDidSigners,
   makeEncryptCallback,
-  makeSignCallback,
   startContainer,
 } from '../../../tests'
-import { receiveSessionRequest, requestSession, verifySession } from '../session'
-import { IRequestAttestation, IRequestPayment, ISession, ISessionRequest, ISubmitTerms, ITerms } from '../../../types'
 import {
-  confirmPayment,
-  receiveAttestation,
-  requestAttestation,
-  requestPayment,
-  submitAttestation,
-  submitTerms,
-  validateConfirmedPayment,
-} from '.'
+  DecryptCallback,
+  EncryptCallback,
+  IConfirmPaymentContent,
+  IRequestAttestation,
+  IRequestPayment,
+  ISession,
+  ISessionRequest,
+  ISubmitTerms,
+  ITerms,
+} from '../../../types'
 import {
   isIConfirmPayment,
   isIRequestPayment,
@@ -59,22 +55,22 @@ import {
   isSubmitTerms,
 } from '../../../utils'
 import { decrypt } from '../../MessageEnvelope'
-import { verifyAttesterSignedQuote, verifyQuoteAgreement } from '../../../quote'
+import { receiveSessionRequest, requestSession, verifySession } from '../session'
 
 describe('Attestation', () => {
   //Alice
   let aliceAccount: KiltKeyringPair
   let aliceFullDid: DidDocument
-  let aliceSign: KeyToolSignCallback
-  let aliceSignAssertion: KeyToolSignCallback
+  let aliceSign: KeyToolSigners
+  let aliceSignAssertion: KeyToolSigners
   let aliceDecryptCallback: DecryptCallback
   let aliceEncryptCallback: EncryptCallback
   let aliceMnemonic: string
 
   //Bob
   let bobAccount: KiltKeyringPair
   let bobFullDid: DidDocument
-  let bobSign: KeyToolSignCallback
+  let bobSign: KeyToolSigners
   let bobDecryptCallback: DecryptCallback
   let bobEncryptCallback: EncryptCallback
 
@@ -107,8 +103,8 @@ describe('Attestation', () => {
     const keyPairsAlice = await keypairs(aliceMnemonic)
     aliceEncryptCallback = makeEncryptCallback(keyPairsAlice.keyAgreement)(aliceFullDid)
     aliceDecryptCallback = makeDecryptCallback(keyPairsAlice.keyAgreement)
-    aliceSign = makeSignCallback(keyPairsAlice.authentication)
-    aliceSignAssertion = makeSignCallback(keyPairsAlice.assertionMethod)
+    aliceSign = makeDidSigners(keyPairsAlice.authentication)
+    aliceSignAssertion = makeDidSigners(keyPairsAlice.assertionMethod)
 
     //setup bob
     const bobMnemonic = mnemonicGenerate()
@@ -119,7 +115,7 @@ describe('Attestation', () => {
     const keyPairsBob = await keypairs(bobMnemonic)
     bobEncryptCallback = makeEncryptCallback(keyPairsBob.keyAgreement)(bobFullDid)
     bobDecryptCallback = makeDecryptCallback(keyPairsBob.keyAgreement)
-    bobSign = makeSignCallback(keyPairsBob.authentication)
+    bobSign = makeDidSigners(keyPairsBob.authentication)
 
     //sessions
     sessionRequest = requestSession(aliceFullDid, 'MyApp')
@@ -128,7 +124,7 @@ describe('Attestation', () => {
       sessionRequest,
       bobEncryptCallback,
       bobDecryptCallback,
-      bobSign(bobFullDid)
+      await bobSign(bobFullDid)
     )
     bobSession = session
 
@@ -137,7 +133,7 @@ describe('Attestation', () => {
       sessionResponse,
       aliceDecryptCallback,
       aliceEncryptCallback,
-      aliceSign(aliceFullDid)
+      await aliceSign(aliceFullDid)
     )
 
     testCType = CType.fromProperties('testCtype', {
@@ -148,10 +144,10 @@ describe('Attestation', () => {
       name: 'Bob',
     }
 
-    claim = Claim.fromCTypeAndClaimContents(testCType, claimContents, bobFullDid.uri)
+    claim = Claim.fromCTypeAndClaimContents(testCType, claimContents, bobFullDid.id)
 
     const quoteData = {
-      attesterDid: aliceFullDid.uri,
+      attesterDid: aliceFullDid.id,
       cTypeHash: claim.cTypeHash,
       cost: {
         tax: { vat: 3.3 },
@@ -163,7 +159,7 @@ describe('Attestation', () => {
       timeframe: new Date(2023, 8, 23).toISOString(),
     }
     // Quote signed by attester
-    const quoteAttesterSigned = await Quote.createAttesterSignedQuote(quoteData, aliceSign(aliceFullDid))
+    const quoteAttesterSigned = await createAttesterSignedQuote(quoteData, aliceSession['authenticationSigner'])
 
     submitTermsContent = {
       claim,
@@ -302,7 +298,7 @@ describe('Attestation', () => {
 
     const txTransfer = api.tx.balances.transfer(aliceAccount.address, COST)
 
-    const finalizedTx = await ChainHelpers.Blockchain.signAndSubmitTx(txTransfer, bobAccount, {
+    const finalizedTx = await Blockchain.signAndSubmitTx(txTransfer, bobAccount, {
       resolveOn: Blockchain.IS_FINALIZED,
     })
 
@@ -334,7 +330,7 @@ describe('Attestation', () => {
       delegationId: null,
       claimHash: credential.rootHash,
       cTypeHash: claim.cTypeHash,
-      owner: bobFullDid.uri,
+      owner: bobFullDid.id,
       revoked: false,
     }
 
@@ -363,7 +359,7 @@ describe('Attestation', () => {
       delegationId: null,
       claimHash: credential.rootHash,
       cTypeHash: claim.cTypeHash,
-      owner: bobFullDid.uri,
+      owner: bobFullDid.id,
       revoked: false,
     }
 
@@ -372,11 +368,11 @@ describe('Attestation', () => {
     const requestAttestationMessages = await requestAttestation(requestTerms.encryptedMessage, credential, bobSession)
 
     // Anchor attestation to the blockchain
-    await createCtype(aliceFullDid.uri, aliceAccount, aliceMnemonic, testCType)
+    await createCtype(aliceFullDid.id, aliceAccount, aliceMnemonic, testCType)
     await createAttestation(
       aliceAccount,
-      aliceFullDid.uri,
-      aliceSignAssertion(aliceFullDid),
+      aliceFullDid.id,
+      await aliceSignAssertion(aliceFullDid),
       credential.rootHash,
       claim.cTypeHash
     )