Couple wrapper integration test fixes

Signed-off-by: Miroslav Kovar <miroslavkovar@protonmail.com>

agents/node/vcxagent-core/demo/alice.js

@@ -93,7 +93,7 @@ async function runAlice (options) {
 
 function _validateMsgs (msgs) {
   logger.debug(`Validating messages:\n${JSON.stringify(msgs, null, 2)}`)
-  assert(msgs.length === 5)
+  assert(msgs.length === 4)
   assert(msgs[0].uid)
   assert(msgs[0].statusCode)
   assert(msgs[0].decryptedMsg)

agents/node/vcxagent-core/demo/faber.js

@@ -88,12 +88,12 @@ async function runFaber (options) {
     let proofProtocolState = await vcxProof.updateStateV2(connectionToAlice)
     logger.debug(`vcxProof = ${JSON.stringify(vcxProof)}`)
     logger.debug(`proofState = ${proofProtocolState}`)
-    while (proofProtocolState !== StateType.Accepted) { // even if revoked credential was used, state should in final state be StateType.Accepted
+    while (![2, 3].includes(proofProtocolState)) { // even if revoked credential was used, state should in final state be StateType.Accepted
       await sleepPromise(2000)
       proofProtocolState = await vcxProof.updateStateV2(connectionToAlice)
       logger.info(`proofState=${proofProtocolState}`)
-      if (proofProtocolState === StateType.None) {
-        logger.error(`Faber proof protocol state is ${StateType.None} which an error has ocurred.`)
+      if (proofProtocolState === 3) {
+        logger.error(`Faber proof protocol state is ${3} which an error has ocurred.`)
         logger.error(`Serialized proof state = ${JSON.stringify(await vcxProof.serialize())}`)
         process.exit(-1)
       }

agents/node/vcxagent-core/src/agent.js

@@ -30,6 +30,7 @@ async function createVcxAgent ({ agentName, genesisPath, agencyUrl, seed, usePos
     await storageService.saveAgentProvision(agentProvision)
   }
   const agentProvision = await storageService.loadAgentProvision()
+  const issuerDid = agentProvision.issuerConfig["institution_did"]
 
   async function agentInitVcx () {
     logger.info(`Initializing ${agentName} vcx session.`)
@@ -93,7 +94,8 @@ async function createVcxAgent ({ agentName, genesisPath, agencyUrl, seed, usePos
     loadCredDef: storageService.loadCredentialDefinition,
     saveIssuerCredential: storageService.saveCredIssuer,
     loadIssuerCredential: storageService.loadCredIssuer,
-    listIssuerCredentialIds: storageService.listCredIssuerKeys
+    listIssuerCredentialIds: storageService.listCredIssuerKeys,
+    issuerDid
   })
   const serviceCredHolder = createServiceCredHolder({
     logger,

agents/node/vcxagent-core/src/services/service-connections.js

@@ -50,7 +50,7 @@ module.exports.createServiceConnections = function createServiceConnections ({ l
 
   async function _progressConnectionToAcceptedState (connection, attemptsThreshold, timeoutMs) {
     async function progressToAcceptedState () {
-      if (await connection.updateState() !== StateType.Accepted) {
+      if (await connection.updateState() !== 4) {
         return { result: undefined, isFinished: false }
       } else {
         return { result: null, isFinished: true }

agents/node/vcxagent-core/src/services/service-cred-holder.js

@@ -11,6 +11,7 @@ module.exports.createServiceCredHolder = function createServiceCredHolder ({ log
   async function _getOffers (connection, filter, attemptsThreshold, timeoutMs) {
     async function findSomeCredOffer () {
       let offers = await Credential.getOffers(connection)
+      logger.info(`Offers: ${offers}`)
       if (filter && filter.schemaIdRegex) {
         offers = filterOffersBySchema(offers, filter.schemaIdRegex)
       }
@@ -49,7 +50,7 @@ module.exports.createServiceCredHolder = function createServiceCredHolder ({ log
   async function waitForCredential (connectionId, holderCredentialId, attemptsThreshold = 10, timeoutMs = 2000) {
     const connection = await loadConnection(connectionId)
     const credential = await loadHolderCredential(holderCredentialId)
-    await _progressCredentialToState(credential, connection, StateType.Accepted, attemptsThreshold, timeoutMs)
+    await _progressCredentialToState(credential, connection, 2, attemptsThreshold, timeoutMs)
     logger.info('Credential has been received.')
     await saveHolderCredential(holderCredentialId, credential)
     return getCredentialData(holderCredentialId)

agents/node/vcxagent-core/src/services/service-cred-issuer.js

@@ -4,7 +4,7 @@ const {
 } = require('@hyperledger/node-vcx-wrapper')
 const { pollFunction } = require('../common')
 
-module.exports.createServiceCredIssuer = function createServiceCredIssuer ({ logger, loadConnection, loadCredDef, saveIssuerCredential, loadIssuerCredential, listIssuerCredentialIds }) {
+module.exports.createServiceCredIssuer = function createServiceCredIssuer ({ logger, loadConnection, loadCredDef, saveIssuerCredential, loadIssuerCredential, listIssuerCredentialIds, issuerDid }) {
   async function sendOffer (issuerCredId, connectionId, credDefId, schemaAttrs) {
     const connection = await loadConnection(connectionId)
     const credDef = await loadCredDef(credDefId)
@@ -14,7 +14,8 @@ module.exports.createServiceCredIssuer = function createServiceCredIssuer ({ log
       sourceId: 'alice_degree',
       credDefHandle: credDef.handle,
       credentialName: 'cred',
-      price: '0'
+      price: '0',
+      issuerDid
     })
     logger.info(`Per issuer credential ${issuerCredId}, sending cred offer to connection ${connectionId}`)
     await issuerCred.sendOffer(connection)
@@ -36,7 +37,7 @@ module.exports.createServiceCredIssuer = function createServiceCredIssuer ({ log
     const issuerCred = await loadIssuerCredential(issuerCredId)
     const connection = await loadConnection(connectionId)
     logger.debug('Going to wait until credential request is received.')
-    await _progressIssuerCredentialToState(issuerCred, connection, StateType.RequestReceived, 10, 2000)
+    await _progressIssuerCredentialToState(issuerCred, connection, 2, 10, 2000)
     await saveIssuerCredential(issuerCredId, issuerCred)
   }
 
@@ -45,7 +46,7 @@ module.exports.createServiceCredIssuer = function createServiceCredIssuer ({ log
     const connection = await loadConnection(connectionId)
     const issuerCred = await loadIssuerCredential(issuerCredId)
     logger.info('Going to wait until counterparty accepts the credential.')
-    await _progressIssuerCredentialToState(issuerCred, connection, StateType.Accepted, 10, 2000)
+    await _progressIssuerCredentialToState(issuerCred, connection, 4, 10, 2000)
     await saveIssuerCredential(issuerCredId, issuerCred)
   }
 

agents/node/vcxagent-core/src/services/service-prover.js

@@ -35,7 +35,7 @@ module.exports.createServiceProver = function createServiceProver ({ logger, loa
       }
     }
 
-    const [error, proofRequests] = await pollFunction(findSomeRequests, 'Get credential offer', logger, attemptsThreshold, timeoutMs)
+    const [error, proofRequests] = await pollFunction(findSomeRequests, 'Get proof request', logger, attemptsThreshold, timeoutMs)
     if (error) {
       throw Error(`Couldn't find any proof request. ${error}`)
     }
@@ -84,7 +84,7 @@ module.exports.createServiceProver = function createServiceProver ({ logger, loa
     await sendDisclosedProof(disclosedProofId, connectionId)
     const disclosedProof = await loadDisclosedProof(disclosedProofId)
     const connection = await loadConnection(connectionId)
-    await _progressProofToState(disclosedProof, connection, [StateType.Accepted, StateType.None])
+    await _progressProofToState(disclosedProof, connection, [2, 3])
     const state = await disclosedProof.getState()
     await saveDisclosedProof(disclosedProofId, disclosedProof)
     return state

agents/node/vcxagent-core/src/utils/vcx-workflows.js

@@ -85,9 +85,10 @@ async function provisionAgentInAgency (agentName, genesisPath, agencyUrl, seed,
   logger.debug(`Configuring issuer's wallet with seed: ${seed}`)
   const issuerConfig = JSON.parse(await configureIssuerWallet(seed))
   issuerConfig.institution_name = agentName
+  logger.debug(`Configured issuer wallet with config: ${JSON.stringify(issuerConfig, null, 2)}`)
   logger.debug(`Provisioning agent with config: ${JSON.stringify(agencyConfig, null, 2)}`)
   agencyConfig = JSON.parse(await provisionCloudAgent(agencyConfig))
-  logger.debug(`Provisined agent with config: ${JSON.stringify(agencyConfig, null, 2)}`)
+  logger.debug(`Provisioned agent with config: ${JSON.stringify(agencyConfig, null, 2)}`)
   await closeMainWallet()
 
   return { agencyConfig, issuerConfig, walletConfig }